1 files changed, 7 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index bba973b1c..f50cc7e46 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -426,11 +426,14 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete
             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;