diff options
author | linyuh <linyuh@google.com> | 2018-01-04 13:40:44 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-04 15:00:35 -0800 |
commit | 18e23785eb89a9adfaeb09b636b793921ecdabdd (patch) | |
tree | 6c9dc77f9a83c548d43b0c74a4550a86076b8ba6 /java/com/android/dialer/calllog/datasources | |
parent | b2df8b308af8a5ccb1222f60f1ef57803153a084 (diff) |
Add column CAN_REPORT_AS_INVALID_NUMBER to the annotated call log.
This column is filled by PhoneLookupDataSource using PhoneLookupInfo#PeopleApiInfo.
Bug: 70218437
Test: AnnotatedCallLogDatabaseHelperTest, PhoneLookupDataSourceTest, RowCombinerTest, CoalescedAnnotatedCallLogCursorLoaderTest, PhoneLookupSelectorTest
PiperOrigin-RevId: 180839783
Change-Id: I8d5ddb940670724fd4bf6dd6a50dcf408f91da9d
Diffstat (limited to 'java/com/android/dialer/calllog/datasources')
-rw-r--r-- | java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java | 4 | ||||
-rw-r--r-- | java/com/android/dialer/calllog/datasources/util/RowCombiner.java | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java index 56e909e84..214862793 100644 --- a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java +++ b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java @@ -268,6 +268,7 @@ public final class PhoneLookupDataSource implements CallLogDataSource { .useMostRecentString(AnnotatedCallLog.PHOTO_URI) .useMostRecentLong(AnnotatedCallLog.PHOTO_ID) .useMostRecentString(AnnotatedCallLog.LOOKUP_URI) + .useMostRecentInt(AnnotatedCallLog.CAN_REPORT_AS_INVALID_NUMBER) .combine(); } @@ -564,6 +565,9 @@ public final class PhoneLookupDataSource implements CallLogDataSource { AnnotatedCallLog.LOOKUP_URI, PhoneLookupSelector.selectLookupUri(phoneLookupInfo)); contentValues.put( AnnotatedCallLog.NUMBER_TYPE_LABEL, PhoneLookupSelector.selectNumberLabel(phoneLookupInfo)); + contentValues.put( + AnnotatedCallLog.CAN_REPORT_AS_INVALID_NUMBER, + PhoneLookupSelector.canReportAsInvalidNumber(phoneLookupInfo)); } private static Uri numberUri(String number) { diff --git a/java/com/android/dialer/calllog/datasources/util/RowCombiner.java b/java/com/android/dialer/calllog/datasources/util/RowCombiner.java index ebb1ba665..6e33db51e 100644 --- a/java/com/android/dialer/calllog/datasources/util/RowCombiner.java +++ b/java/com/android/dialer/calllog/datasources/util/RowCombiner.java @@ -32,6 +32,13 @@ public class RowCombiner { } /** Use the most recent value for the specified column. */ + public RowCombiner useMostRecentInt(String columnName) { + combinedRow.put( + columnName, individualRowsSortedByTimestampDesc.get(0).getAsInteger(columnName)); + return this; + } + + /** Use the most recent value for the specified column. */ public RowCombiner useMostRecentLong(String columnName) { combinedRow.put(columnName, individualRowsSortedByTimestampDesc.get(0).getAsLong(columnName)); return this; |