diff options
| author | Owen Lin <owenlin@google.com> | 2009-06-29 17:30:24 -0700 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2009-06-30 14:00:37 -0700 |
| commit | 387833adb5ea8ff6be37a5582ef965da839668bd (patch) | |
| tree | 0b00d427dc8e6a726307d87c82e13bd72c9cc690 /src/com/android | |
| parent | 3283e049aa080c375457de46bbf180a88899228a (diff) | |
| download | packages_apps_LegacyCamera-387833adb5ea8ff6be37a5582ef965da839668bd.zip packages_apps_LegacyCamera-387833adb5ea8ff6be37a5582ef965da839668bd.tar.gz packages_apps_LegacyCamera-387833adb5ea8ff6be37a5582ef965da839668bd.tar.bz2 | |
Fix bug 1949582. If this is the last image to be deleted,
the mCurrentPosition will be -1 and getImageAt() will return null and thus
cause a NPE. If the image list is empty just return null is enough.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/ReviewImage.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/ViewImage.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/ReviewImage.java b/src/com/android/camera/ReviewImage.java index 6ea35bb..1e40823 100644 --- a/src/com/android/camera/ReviewImage.java +++ b/src/com/android/camera/ReviewImage.java @@ -842,6 +842,7 @@ public class ReviewImage extends Activity implements View.OnClickListener { } private Uri getCurrentUri() { + if (mAllImages.getCount() == 0) return null; IImage image = mAllImages.getImageAt(mCurrentPosition); return image.fullSizeImageUri(); } diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java index 47fdd77..1f272dc 100644 --- a/src/com/android/camera/ViewImage.java +++ b/src/com/android/camera/ViewImage.java @@ -905,6 +905,7 @@ public class ViewImage extends Activity implements View.OnClickListener { } private Uri getCurrentUri() { + if (mAllImages.getCount() == 0) return null; IImage image = mAllImages.getImageAt(mCurrentPosition); return image.fullSizeImageUri(); } |