commit c03c0c608b19bb83bccb2a2f9023463883650de8
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 30 00:44:50 2017 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Mar 30 00:44:50 2017 -0700
tree 4a58bf8bf05b32227d069a287778e1fed9107004
parent 0547c30805e5054032e3e56c7e17845b5a46baac
parent 356e626a86d37f4da1df557e590734abc735f21b

Merge 356e626a86d37f4da1df557e590734abc735f21b on remote branch

Change-Id: I7b2204dcff7d42cca8e03b0d9bac57d3a9469446

src/com/android/dialer/calllog/ContactInfoHelper.java

diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index ea39d03..c07ca2a 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -292,10 +292,13 @@
                 }
                 String combName = "";
                 for (String num : nums) {
-                    ContactInfo singleCi = lookupContactFromUri(getContactInfoLookupUri(num),
-                            isSip);
+                    ContactInfo singleCi = null;
+                    if (!TextUtils.isEmpty(num)) {
+                        singleCi = lookupContactFromUri(
+                                getContactInfoLookupUri(num), isSip);
+                    }
                     // If contact does not exist, need to avoid changing static empty-contact.
-                    if (singleCi == ContactInfo.EMPTY) {
+                    if (singleCi == null || singleCi == ContactInfo.EMPTY) {
                         singleCi = new ContactInfo();
                     }
                     if (TextUtils.isEmpty(singleCi.name)) {