commit bf9b213e047da2f39d2b7fd237aad1e08e46e813
author Daisuke Miyakawa <dmiyakawa@google.com> Tue Oct 11 19:03:52 2011 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Thu Oct 13 10:27:34 2011 -0700
tree 242f5ca204f27646c16a64e8862a9240339ddce7
parent ca5108d0a25020bf12a324ef2d1ce13d73a9b828

Fix possible NPE in ContactPhotoManager.

It may put null to LRUCache when input has some problem.

Reported via public issue tracker (issue 18369)

Bug: 5447001
Change-Id: Icee410d2a999af3aae828b5a0eb61fb9b5c7db99

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;