commit 61fcb22e417d795802906fe2de447de2043b073d
author Yorke Lee <yorkelee@google.com> Mon Sep 30 17:10:59 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 30 17:10:59 2013 -0700
tree 757efd62fd09e834bf5be2cba360679a32047b87
parent acf2a7cebd91df8b2b9025d838ad39b80538de29
parent 095f112b1bd44ac6d1d2fd80b515a76ea40ca586

am 095f112b: Merge "Fix incorrect photouri on call shortcut" into klp-dev

* commit '095f112b1bd44ac6d1d2fd80b515a76ea40ca586':
  Fix incorrect photouri on call shortcut

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 86540ef..4bc1787 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -190,7 +190,6 @@
     private boolean mIsCallLog = true;
     private int mNumMissedCalls = 0;
     private int mNumMissedCallsShown = 0;
-    private Uri mCurrentPhotoUri;
 
     private View mBadgeContainer;
     private ImageView mBadgeImageView;
@@ -846,19 +845,11 @@
     }
 
     private void setPhoto(CallLogListItemViews views, long photoId, Uri contactUri) {
-        mCurrentPhotoUri = null;
         views.quickContactView.assignContactUri(contactUri);
         mContactPhotoManager.loadThumbnail(views.quickContactView, photoId, false /* darkTheme */);
     }
 
     private void setPhoto(CallLogListItemViews views, Uri photoUri, Uri contactUri) {
-        if (photoUri.equals(mCurrentPhotoUri)) {
-            // photo manager will perform a fade in transition.  To avoid flicker, do not set the
-            // same photo multiple times.
-            return;
-        }
-
-        mCurrentPhotoUri = photoUri;
         views.quickContactView.assignContactUri(contactUri);
         mContactPhotoManager.loadDirectoryPhoto(views.quickContactView, photoUri,
                 false /* darkTheme */);