diff options
Diffstat (limited to 'java/com/android/dialer/calllog')
4 files changed, 28 insertions, 3 deletions
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java index 39a806568..68298e356 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java @@ -148,7 +148,7 @@ public class AnnotatedCallLogContentProvider extends ContentProvider { @Nullable @Override public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) { - // Javadoc states values is not nullable, even though it is annotated as such (b/38123194)! + // Javadoc states values is not nullable, even though it is annotated as such (a bug)! Assert.checkArgument(values != null); SQLiteDatabase database = databaseHelper.getWritableDatabase(); @@ -228,7 +228,7 @@ public class AnnotatedCallLogContentProvider extends ContentProvider { @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) { - // Javadoc states values is not nullable, even though it is annotated as such (b/38123194)! + // Javadoc states values is not nullable, even though it is annotated as such (a bug)! Assert.checkArgument(values != null); SQLiteDatabase database = databaseHelper.getWritableDatabase(); diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java index 589fe6384..a3180a0b9 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java @@ -44,6 +44,7 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { .append(AnnotatedCallLog.PHOTO_URI + " string, ") .append(AnnotatedCallLog.PHOTO_ID + " integer, ") .append(AnnotatedCallLog.LOOKUP_URI + " string, ") + .append(AnnotatedCallLog.DURATION + " integer, ") .append(AnnotatedCallLog.NUMBER_TYPE_LABEL + " string, ") .append(AnnotatedCallLog.IS_READ + " integer, ") .append(AnnotatedCallLog.NEW + " integer, ") @@ -55,7 +56,9 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { .append(AnnotatedCallLog.FEATURES + " integer, ") .append(AnnotatedCallLog.IS_BUSINESS + " integer, ") .append(AnnotatedCallLog.IS_VOICEMAIL + " integer, ") - .append(AnnotatedCallLog.CALL_TYPE + " integer") + .append(AnnotatedCallLog.TRANSCRIPTION + " integer, ") + .append(AnnotatedCallLog.CALL_TYPE) + .append(" integer") .append(");") .toString(); diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java index e79ffd090..832a9c2c0 100644 --- a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java +++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java @@ -218,6 +218,20 @@ public class AnnotatedCallLogContract { /** The MIME type of a {@link android.content.ContentProvider#getType(Uri)} single entry. */ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/annotated_call_log"; + + /** + * See {@link android.provider.CallLog.Calls#DURATION}. + * + * <p>TYPE: INTEGER (int) + */ + public static final String DURATION = "duration"; + + /** + * See {@link android.provider.CallLog.Calls#TRANSCRIPTION}. + * + * <p>TYPE: TEXT + */ + public static final String TRANSCRIPTION = "transcription"; } /** diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java index 681a86da7..5c73933a9 100644 --- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java +++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java @@ -216,6 +216,8 @@ public class SystemCallLogDataSource implements CallLogDataSource { Calls.CACHED_LOOKUP_URI, Calls.CACHED_NUMBER_TYPE, Calls.CACHED_NUMBER_LABEL, + Calls.DURATION, + Calls.TRANSCRIPTION, Calls.IS_READ, Calls.NEW, Calls.GEOCODED_LOCATION, @@ -252,6 +254,8 @@ public class SystemCallLogDataSource implements CallLogDataSource { int cachedLookupUriColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_LOOKUP_URI); int cachedNumberTypeColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_NUMBER_TYPE); int cachedNumberLabelColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_NUMBER_LABEL); + int durationsColumn = cursor.getColumnIndexOrThrow(Calls.DURATION); + int transcriptionColumn = cursor.getColumnIndexOrThrow(Calls.TRANSCRIPTION); int isReadColumn = cursor.getColumnIndexOrThrow(Calls.IS_READ); int newColumn = cursor.getColumnIndexOrThrow(Calls.NEW); int geocodedLocationColumn = cursor.getColumnIndexOrThrow(Calls.GEOCODED_LOCATION); @@ -276,6 +280,8 @@ public class SystemCallLogDataSource implements CallLogDataSource { String cachedLookupUri = cursor.getString(cachedLookupUriColumn); int cachedNumberType = cursor.getInt(cachedNumberTypeColumn); String cachedNumberLabel = cursor.getString(cachedNumberLabelColumn); + int duration = cursor.getInt(durationsColumn); + String transcription = cursor.getString(transcriptionColumn); int isRead = cursor.getInt(isReadColumn); int isNew = cursor.getInt(newColumn); String geocodedLocation = cursor.getString(geocodedLocationColumn); @@ -321,6 +327,8 @@ public class SystemCallLogDataSource implements CallLogDataSource { populatePhoneAccountLabelAndColor( appContext, contentValues, phoneAccountComponentName, phoneAccountId); contentValues.put(AnnotatedCallLog.FEATURES, features); + contentValues.put(AnnotatedCallLog.DURATION, duration); + contentValues.put(AnnotatedCallLog.TRANSCRIPTION, transcription); if (existingAnnotatedCallLogIds.contains(id)) { mutations.update(id, contentValues); |