Fix 2186855: NPE in ViewImage.setImage.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index ec5655a3..7a334117 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -404,8 +404,12 @@ public class ViewImage extends NoSearchActivity implements View.OnClickListener
                         Uri uri = image.fullSizeImageUri();
                         cb.run(uri, image);
 
-                        mImageView.clear();
-                        setImage(mCurrentPosition, false);
+                        // We might have deleted all images in the callback, so
+                        // call setImage() only if we still have some images.
+                        if (mAllImages.getCount() > 0) {
+                            mImageView.clear();
+                            setImage(mCurrentPosition, false);
+                        }
                     }
                 });