commit 5ecd315cbd9e9421cbff0a2692a391156450c454
author Dmitri Plotnikov <dplotnikov@google.com> Fri Apr 02 13:21:20 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 02 13:21:20 2010 -0700
tree f628848b1627be5149baf241a596376fe7949ca3
parent feb77f1ee1173141395a964577193735b35bc3b5
parent 92dfa11fe98d453b7aaa7c3c1516b187c60c106c

Merge "Fixing NPE in contact photo loader" into froyo

src/com/android/contacts/ContactPhotoLoader.java

diff --git a/src/com/android/contacts/ContactPhotoLoader.java b/src/com/android/contacts/ContactPhotoLoader.java
index d250a86..96f55a6 100644
--- a/src/com/android/contacts/ContactPhotoLoader.java
+++ b/src/com/android/contacts/ContactPhotoLoader.java
@@ -325,7 +325,7 @@
         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);