commit 0e52f40b8469382613eb666fe7d5f39b4dbb4e90
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Oct 13 12:41:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 12:41:55 2011 -0700
tree 1228f67042a6f8b07e95ea67e371b515afbfb734
parent 832dc19a65868b65f1e2d390a0c3cea413f61d2c
parent bf9b213e047da2f39d2b7fd237aad1e08e46e813

Merge "Fix possible NPE in ContactPhotoManager." into ics-mr0

src/com/android/contacts/ContactPhotoManager.java

diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index e04a07a..7b54666 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -359,8 +359,10 @@
 
         view.setImageBitmap(holder.bitmap);
 
-        // Put the bitmap in the LRU cache
-        mBitmapCache.put(request, holder.bitmap);
+        if (holder.bitmap != null) {
+            // Put the bitmap in the LRU cache
+            mBitmapCache.put(request, holder.bitmap);
+        }
 
         // Soften the reference
         holder.bitmap = null;