summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/contacts
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2015-03-30 19:24:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-30 19:24:59 +0000
commitfc237d0d3a2ac25e96adf1cc732d8b5563772747 (patch)
tree95fb0cc1d2d70902b33e05b67be7b8020c4c44e3 /src/com/android/providers/contacts
parent2ded4cc7b214d7cddee9d3130744400fcb8cc1f0 (diff)
parent9d5369ac6c1d788384d52b11da10f60571238405 (diff)
downloadpackages_providers_ContactsProvider-fc237d0d3a2ac25e96adf1cc732d8b5563772747.tar.gz
packages_providers_ContactsProvider-fc237d0d3a2ac25e96adf1cc732d8b5563772747.tar.bz2
packages_providers_ContactsProvider-fc237d0d3a2ac25e96adf1cc732d8b5563772747.zip
Merge "Enterprise quick contact 2/2"
Diffstat (limited to 'src/com/android/providers/contacts')
-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 47dbf2e7..d1776514 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