aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuprabh Shukla <suprabh@google.com>2016-09-06 15:31:46 -0700
committerSuprabh Shukla <suprabh@google.com>2016-09-09 15:28:49 -0700
commite6bd43bb42dfbef18d4f7b57375d5a71214d03ae (patch)
tree9a9a9d8af35e14fd114229aace5395735733b0a2
parentd129874069194e8a9f4bfee55e951ae3b650a315 (diff)
downloadContactsProvider-e6bd43bb42dfbef18d4f7b57375d5a71214d03ae.tar.gz
Adding column display_name_alt to phone_lookup
Clients like Dialer have to run a separate query just to get display name alternative. Adding it to the phone lookup projection columns. Bug: 25022549 Change-Id: Ic3d08d096c0b909f7a9a6cb9bd2c137fa4df1191
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java7
-rw-r--r--tests/src/com/android/providers/contacts/ContactsProvider2Test.java12
2 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 934f4e3e..ac9108c2 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -976,7 +976,14 @@ public class ContactsProvider2 extends AbstractContactsProvider
.add(PhoneLookup.CONTACT_ID, "contacts_view." + Contacts._ID)
.add(PhoneLookup.DATA_ID, PhoneLookup.DATA_ID)
.add(PhoneLookup.LOOKUP_KEY, "contacts_view." + Contacts.LOOKUP_KEY)
+ .add(PhoneLookup.DISPLAY_NAME_SOURCE, "contacts_view." + Contacts.DISPLAY_NAME_SOURCE)
.add(PhoneLookup.DISPLAY_NAME, "contacts_view." + Contacts.DISPLAY_NAME)
+ .add(PhoneLookup.DISPLAY_NAME_ALTERNATIVE,
+ "contacts_view." + Contacts.DISPLAY_NAME_ALTERNATIVE)
+ .add(PhoneLookup.PHONETIC_NAME, "contacts_view." + Contacts.PHONETIC_NAME)
+ .add(PhoneLookup.PHONETIC_NAME_STYLE, "contacts_view." + Contacts.PHONETIC_NAME_STYLE)
+ .add(PhoneLookup.SORT_KEY_PRIMARY, "contacts_view." + Contacts.SORT_KEY_PRIMARY)
+ .add(PhoneLookup.SORT_KEY_ALTERNATIVE, "contacts_view." + Contacts.SORT_KEY_ALTERNATIVE)
.add(PhoneLookup.LAST_TIME_CONTACTED, "contacts_view." + Contacts.LAST_TIME_CONTACTED)
.add(PhoneLookup.TIMES_CONTACTED, "contacts_view." + Contacts.TIMES_CONTACTED)
.add(PhoneLookup.STARRED, "contacts_view." + Contacts.STARRED)
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index f432b0bb..a0539743 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -711,7 +711,13 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
PhoneLookup.CONTACT_ID,
PhoneLookup.DATA_ID,
PhoneLookup.LOOKUP_KEY,
+ PhoneLookup.DISPLAY_NAME_SOURCE,
PhoneLookup.DISPLAY_NAME,
+ PhoneLookup.DISPLAY_NAME_ALTERNATIVE,
+ PhoneLookup.PHONETIC_NAME,
+ PhoneLookup.PHONETIC_NAME_STYLE,
+ PhoneLookup.SORT_KEY_PRIMARY,
+ PhoneLookup.SORT_KEY_ALTERNATIVE,
PhoneLookup.LAST_TIME_CONTACTED,
PhoneLookup.TIMES_CONTACTED,
PhoneLookup.STARRED,
@@ -739,7 +745,13 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
PhoneLookup.CONTACT_ID,
PhoneLookup.DATA_ID,
PhoneLookup.LOOKUP_KEY,
+ PhoneLookup.DISPLAY_NAME_SOURCE,
PhoneLookup.DISPLAY_NAME,
+ PhoneLookup.DISPLAY_NAME_ALTERNATIVE,
+ PhoneLookup.PHONETIC_NAME,
+ PhoneLookup.PHONETIC_NAME_STYLE,
+ PhoneLookup.SORT_KEY_PRIMARY,
+ PhoneLookup.SORT_KEY_ALTERNATIVE,
PhoneLookup.LAST_TIME_CONTACTED,
PhoneLookup.TIMES_CONTACTED,
PhoneLookup.STARRED,