commit c4b26262269f0db8cfd14d68a0596801642219ff
author Victor Chang <vichang@google.com> Mon Jan 25 21:41:57 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 21:41:57 2016 +0000
tree cfd030ef5928961418e1b5f29c81c652c5122db7
parent e8b7032e0c7c4fbb834f8bda9e5823bd8d32ada0
parent fced467693d0f69c355fe12f0f3feecb5caca0da

Merge "Open work profile QuickContacts for work contacts in personal dialer" into ub-contactsdialer-b-dev

InCallUI/src/com/android/incallui/CallerInfo.java

diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index 6096961..670c3fd 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -241,7 +241,9 @@
                 columnIndex = getColumnIndexForPersonId(contactRef, cursor);
                 if (columnIndex != -1) {
                     contactId = cursor.getLong(columnIndex);
-                    if (contactId != 0 && !Contacts.isEnterpriseContactId(contactId)) {
+                    // QuickContacts in M doesn't support enterprise contact id
+                    if (contactId != 0 && (ContactsUtils.FLAG_N_FEATURE
+                            || !Contacts.isEnterpriseContactId(contactId))) {
                         info.contactIdOrZero = contactId;
                         Log.v(TAG, "==> got info.contactIdOrZero: " + info.contactIdOrZero);
 

InCallUI/src/com/android/incallui/ContactInfoCache.java

diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index bba973b..f50cc7e 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -426,11 +426,14 @@
             cce.displayPhotoUri = info.contactDisplayPhotoUri;
         }
 
-        if (info.lookupKeyOrNull == null || info.contactIdOrZero == 0) {
-            Log.v(TAG, "lookup key is null or contact ID is 0. Don't create a lookup uri.");
-            cce.lookupUri = null;
-        } else {
+        // Support any contact id in N because QuickContacts in N starts supporting enterprise
+        // contact id
+        if (info.lookupKeyOrNull != null
+                && (ContactsUtils.FLAG_N_FEATURE || info.contactIdOrZero != 0)) {
             cce.lookupUri = Contacts.getLookupUri(info.contactIdOrZero, info.lookupKeyOrNull);
+        } else {
+            Log.v(TAG, "lookup key is null or contact ID is 0 on M. Don't create a lookup uri.");
+            cce.lookupUri = null;
         }
 
         cce.photo = photo;