summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2015-03-31 17:12:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-31 17:12:05 +0000
commitbb1bc1a5b107e282f974e2a9f43307d0c2144c62 (patch)
tree951ea18583294e7a2128e8122dd1d2ae3aa25f47 /src/com/android/providers
parent518fe53d24f397a7974bcc28d450480db433584e (diff)
parent1076c4946c230612c8eb56dbcdf2e3ca22a624e3 (diff)
downloadpackages_providers_ContactsProvider-bb1bc1a5b107e282f974e2a9f43307d0c2144c62.zip
packages_providers_ContactsProvider-bb1bc1a5b107e282f974e2a9f43307d0c2144c62.tar.gz
packages_providers_ContactsProvider-bb1bc1a5b107e282f974e2a9f43307d0c2144c62.tar.bz2
Merge "Enterprise quick contact 2/2"
Diffstat (limited to 'src/com/android/providers')
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 47dbf2e..d177651 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -6712,6 +6712,14 @@ public class ContactsProvider2 extends AbstractContactsProvider
case Data.CUSTOM_RINGTONE:
builder.add(null);
break;
+ case Contacts.LOOKUP_KEY:
+ final String lookupKey = original.getString(originalColumnIndex);
+ if (TextUtils.isEmpty(lookupKey)) {
+ builder.add(null);
+ } else {
+ builder.add(Contacts.ENTERPRISE_CONTACT_LOOKUP_PREFIX + lookupKey);
+ }
+ break;
default:
if (outputColumnName.equals(contactIdColumnName)) {
// This will be _id if it's PhoneLookup, contacts_id