commit 356e626a86d37f4da1df557e590734abc735f21b
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 15 04:39:06 2017 -0600
committer Linux Build Service Account <lnxbuild@localhost> Wed Mar 15 04:39:06 2017 -0600
tree 4a58bf8bf05b32227d069a287778e1fed9107004
parent a3736fc1113688f44b4c55ed4ce2b076d380bfb4
parent 2881160722bfd2dd6cee9682d5fa0cb84b564b75

Promotion of atel.lnx.2.0-00065.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2012502   Ide5c405bf1d1d61bc5d836f9f6ba4c276b13d908   Fix dialer crash after making 4G confernce call with ano

Change-Id: Ia92ff045667089acb13bdbfb8e0bd139dada6230
CRs-Fixed: 2012502

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