diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-12 04:18:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-12 04:18:23 +0000 |
| commit | efd5f75eaf20473b34dd19fa259c7fd6525ff9b4 (patch) | |
| tree | faf34b910c7c5fbd33a310948d55bd00bc275af0 /java/com/android/dialer/calllog | |
| parent | ddbde1f91e1db86c9b741c4d339d0685f699526e (diff) | |
| parent | 80c8b526a035c7903cf2d2d8fc5196040078c834 (diff) | |
Merge changes I220a35f3,I2460308e,I15b52595,I4ba40e53
* changes:
Use type TEXT instead of STRING for annotated call log columns.
Stop turning on the screen when the incoming/outgoing call is via Bluetooth.
Filter out contacts with null primary display names in search.
Conferece call management screen UI adjustment.
Diffstat (limited to 'java/com/android/dialer/calllog')
| -rw-r--r-- | java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java index 9fd5bd970..3062710d4 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java @@ -38,26 +38,26 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { + " (" + (AnnotatedCallLog._ID + " integer primary key, ") + (AnnotatedCallLog.TIMESTAMP + " integer, ") - + (AnnotatedCallLog.NAME + " string, ") + + (AnnotatedCallLog.NAME + " text, ") + (AnnotatedCallLog.NUMBER + " blob, ") - + (AnnotatedCallLog.FORMATTED_NUMBER + " string, ") - + (AnnotatedCallLog.PHOTO_URI + " string, ") + + (AnnotatedCallLog.FORMATTED_NUMBER + " text, ") + + (AnnotatedCallLog.PHOTO_URI + " text, ") + (AnnotatedCallLog.PHOTO_ID + " integer, ") - + (AnnotatedCallLog.LOOKUP_URI + " string, ") + + (AnnotatedCallLog.LOOKUP_URI + " text, ") + (AnnotatedCallLog.DURATION + " integer, ") - + (AnnotatedCallLog.NUMBER_TYPE_LABEL + " string, ") + + (AnnotatedCallLog.NUMBER_TYPE_LABEL + " text, ") + (AnnotatedCallLog.IS_READ + " integer, ") + (AnnotatedCallLog.NEW + " integer, ") - + (AnnotatedCallLog.GEOCODED_LOCATION + " string, ") - + (AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME + " string, ") - + (AnnotatedCallLog.PHONE_ACCOUNT_ID + " string, ") - + (AnnotatedCallLog.PHONE_ACCOUNT_LABEL + " string, ") + + (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.IS_BUSINESS + " integer, ") + (AnnotatedCallLog.IS_VOICEMAIL + " integer, ") + (AnnotatedCallLog.TRANSCRIPTION + " integer, ") - + (AnnotatedCallLog.VOICEMAIL_URI + " string, ") + + (AnnotatedCallLog.VOICEMAIL_URI + " text, ") + (AnnotatedCallLog.CALL_TYPE + " integer") + ");"; |