diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-08 19:56:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-08 19:56:09 +0000 |
commit | ae916b9c3304621d4733e53a081df8c384c6a868 (patch) | |
tree | 913c4b07fffd2b9eb99ff1f530e050be3471f8f3 /java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java | |
parent | c9d21e15e6bd69496b6de3a1e4168d96d0132975 (diff) | |
parent | afb1d0fa6c9421a8a26c8ad9c5630a3f6f34a8f0 (diff) |
Merge "In the coalesced call log, replace column NUMBER_CALLS with a new column COALESCED_IDS."
Diffstat (limited to 'java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java')
-rw-r--r-- | java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java index 9efe21487..c9c053cea 100644 --- a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java +++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java @@ -274,17 +274,18 @@ public class AnnotatedCallLogContract { "vnd.android.cursor.item/coalesced_annotated_call_log"; /** - * Number of AnnotatedCallLog rows represented by this CoalescedAnnotatedCallLog row. + * IDs of rows in {@link AnnotatedCallLog} that are coalesced into one row in {@link + * CoalescedAnnotatedCallLog}, encoded as a {@link com.android.dialer.CoalescedIds} proto. * - * <p>Type: INTEGER + * <p>Type: BLOB */ - public static final String NUMBER_CALLS = "number_calls"; + public static final String COALESCED_IDS = "coalesced_ids"; /** * Columns that are only in the {@link CoalescedAnnotatedCallLog} but not the {@link * AnnotatedCallLog}. */ - private static final String[] COLUMNS_ONLY_IN_COALESCED_CALL_LOG = new String[] {NUMBER_CALLS}; + private static final String[] COLUMNS_ONLY_IN_COALESCED_CALL_LOG = new String[] {COALESCED_IDS}; /** All columns in the {@link CoalescedAnnotatedCallLog}. */ public static final String[] ALL_COLUMNS = |