Part of Bug 2163087 fix - NPE if the main thread is removing the reference.

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 0dcfc53..0c929ba 100644 (file)
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -2101,8 +2101,13 @@ public class ContactsListActivity extends ListActivity implements
                             break;
                         }
 
-                        Bitmap photo = mBitmapCache.get(photoId).get();
+                        SoftReference<Bitmap> photoRef = mBitmapCache.get(photoId);
+                        if (photoRef == null) {
+                            break;
+                        }
+                        Bitmap photo = photoRef.get();
                         if (photo == null) {
+                            mBitmapCache.remove(photoId);
                             break;
                         }