commit c1048880eb52edd6533f160b0528228a1dc244f5
author Yorke Lee <yorkelee@google.com> Fri Mar 07 18:30:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 18:30:54 2014 +0000
tree e0da52fa20f45c9b9e5ea516fcf9dad82f18a6a1
parent 46b9a3fb8c37b582b068346cbd851f2d4999524f
parent ffb07daa7d0daee76e14bbc55c037fec1e9a7e58

am ffb07daa: am 0b218533: Merge "Fix for letter tile avatars not displaying properly in calllog DO NOT MERGE" into klp-dev

* commit 'ffb07daa7d0daee76e14bbc55c037fec1e9a7e58':
  Fix for letter tile avatars not displaying properly in calllog DO NOT MERGE

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

diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 175a733..aee24ba 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -642,11 +642,8 @@
             contactType = ContactPhotoManager.TYPE_BUSINESS;
         }
 
-        String lookupKey = info.lookupKey;
-        if (lookupUri != null) {
-            //lookupKey = ContactInfoHelper.getLookupKeyFromUri(lookupUri);
-
-        }
+        String lookupKey = lookupUri == null ? null
+                : ContactInfoHelper.getLookupKeyFromUri(lookupUri);
 
         String nameForDefaultImage = null;
         if (TextUtils.isEmpty(name)) {