Fixing NPE in contact photo loader

Bug: 2566919
Change-Id: I8711ce801ca2b80658bcc669f03e3c3d2c28b3bb

diff --git a/src/com/android/contacts/ContactPhotoLoader.java b/src/com/android/contacts/ContactPhotoLoader.java
index d250a86..96f55a6 100644 (file)
--- a/src/com/android/contacts/ContactPhotoLoader.java
+++ b/src/com/android/contacts/ContactPhotoLoader.java
@@ -325,7 +325,7 @@ public class ContactPhotoLoader implements Callback {
         while (iterator.hasNext()) {
             Long id = iterator.next();
             BitmapHolder holder = mBitmapCache.get(id);
-            if (holder.state == BitmapHolder.NEEDED) {
+            if (holder != null && holder.state == BitmapHolder.NEEDED) {
                 // Assuming atomic behavior
                 holder.state = BitmapHolder.LOADING;
                 photoIds.add(id);