Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ecd315c authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Fixing NPE in contact photo loader" into froyo

parents feb77f1e 92dfa11f

src/com/android/contacts/ContactPhotoLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -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);