commit 8516aa4d5fcb5f837e9d9b01f9a8b32fb7de8a9a
author Linux Build Service Account <lnxbuild@localhost> Fri Nov 11 03:00:30 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Nov 11 03:00:30 2016 -0800
tree 7626120dc2c46f5257ffc9ca1b0eea86b5ec4201
parent 6d90ffcd99ea625c7ecf996a93d4f3ee8e8b325d
parent 15bce2b5b5103e152984e18371716dc65b62e6f9

Merge "Fix DialtactsActivity leaks" 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 07db044..bcc9e2f 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -288,6 +288,10 @@
                 for (String num : nums) {
                     ContactInfo singleCi = lookupContactFromUri(getContactInfoLookupUri(num),
                             isSip);
+                    // If contact does not exist, need to avoid changing static empty-contact.
+                    if (singleCi == ContactInfo.EMPTY) {
+                        singleCi = new ContactInfo();
+                    }
                     if (TextUtils.isEmpty(singleCi.name)) {
                         singleCi.name = formatPhoneNumber(num, null, countryIso);
                     }