diff options
| author | linyuh <linyuh@google.com> | 2018-04-16 13:07:20 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-04-16 14:43:00 -0700 |
| commit | 3865d300feeab8c7695762e86004804c052577ae (patch) | |
| tree | 4722ba29c1ea8e58d0c01cb8996cc964c1c3a6e0 /java/com/android/dialer/calllog/database | |
| parent | c298ec9c33d105971dbe612cd7798f5e9af34f71 (diff) | |
Remove column PHONE_ACCOUNT_LABEL and PHONE_ACCOUNT_COLOR from the annotated call log.
Bug: 77808449
Test: NewCallLogViewHolderTest + existing tests for the call log framework
PiperOrigin-RevId: 193086917
Change-Id: I39244c69acf1d261699610f6010c0cf147ca3492
Diffstat (limited to 'java/com/android/dialer/calllog/database')
| -rw-r--r-- | java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java index 7df83b3d1..66ba8aa59 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java @@ -68,8 +68,6 @@ public class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { + (AnnotatedCallLog.GEOCODED_LOCATION + " text, ") + (AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME + " text, ") + (AnnotatedCallLog.PHONE_ACCOUNT_ID + " text, ") - + (AnnotatedCallLog.PHONE_ACCOUNT_LABEL + " text, ") - + (AnnotatedCallLog.PHONE_ACCOUNT_COLOR + " integer, ") + (AnnotatedCallLog.FEATURES + " integer, ") + (AnnotatedCallLog.TRANSCRIPTION + " integer, ") + (AnnotatedCallLog.VOICEMAIL_URI + " text, ") diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java index b1cf6e495..5e4e4afd3 100644 --- a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java +++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java @@ -103,20 +103,6 @@ public class AnnotatedCallLogContract { String PHONE_ACCOUNT_ID = "phone_account_id"; /** - * String suitable for display which indicates the phone account used to make the call. - * - * <p>TYPE: TEXT - */ - String PHONE_ACCOUNT_LABEL = "phone_account_label"; - - /** - * The color int for the phone account. - * - * <p>TYPE: INTEGER (int) - */ - String PHONE_ACCOUNT_COLOR = "phone_account_color"; - - /** * See {@link android.provider.CallLog.Calls#FEATURES}. * * <p>TYPE: INTEGER (int) @@ -170,8 +156,6 @@ public class AnnotatedCallLogContract { GEOCODED_LOCATION, PHONE_ACCOUNT_COMPONENT_NAME, PHONE_ACCOUNT_ID, - PHONE_ACCOUNT_LABEL, - PHONE_ACCOUNT_COLOR, FEATURES, NUMBER_ATTRIBUTES, IS_VOICEMAIL_CALL, @@ -223,9 +207,9 @@ public class AnnotatedCallLogContract { public static final String TRANSCRIPTION = "transcription"; /** - * See {@link VoicemailCompat.TRANSCRIPTION_STATE} + * See {@link VoicemailCompat#TRANSCRIPTION_STATE} * - * <p>Only populated in {@link Build.VERSION_CODES.O} and above + * <p>Only populated in {@link Build.VERSION_CODES#O} and above * * <p>TYPE: INTEGER */ |