commit 600755a3779f4d0c4d8ee680b6f54fb3dbfbddee
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 30 06:10:49 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 30 06:10:49 2017 -0700
tree 30142b984179bf33def210a5767cf1920b26b96a
parent 2881160722bfd2dd6cee9682d5fa0cb84b564b75
parent 6c396adac450943a3a379a0da4b0139ab87f9f19

Merge "IMS-VT: Fix crash while answering upgrade request." into atel.lnx.2.0-dev

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)) {