commit fd20dc7a1e53c8ab0693cbee8ee78e886b10f578
author Devci Telephony <devci-telephony@localhost> Fri Mar 10 04:08:09 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 10 04:08:09 2017 -0800
tree 3f23279f78b19f48c630e4929b127ca1ead0a7a5
parent 1baf36f04dc35119dcc04e60592885cef578a024
parent 7059b40f0914e7f391035ec88a6d00e0620157bb

Merge "IMS-VT: CameraCapabilities are not passed to UI." into atel.lnx.2.0.c1-dev

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

diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
index 8f011e3..54bd571 100644
--- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java
+++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
@@ -90,6 +90,7 @@
 
         InCallPresenter.getInstance().onServiceUnbind();
         tearDown();
+        StatusBarNotifier.clearAllCallNotifications(getApplicationContext());
 
         return false;
     }

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