diff options
| author | John Hoford <hoford@google.com> | 2013-09-06 15:02:21 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-09-06 15:02:21 -0700 |
| commit | 98b296ffc50e11b7950acf1d0df850b617913131 (patch) | |
| tree | e030a9fd38c3080e3f6ad3e394c0c552168f3528 /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | 708753f5a087eb759ef48fe9b41ef2274d2e88a7 (diff) | |
| download | android_packages_apps_Gallery2-98b296ffc50e11b7950acf1d0df850b617913131.tar.gz android_packages_apps_Gallery2-98b296ffc50e11b7950acf1d0df850b617913131.tar.bz2 android_packages_apps_Gallery2-98b296ffc50e11b7950acf1d0df850b617913131.zip | |
fix Gallery crash while deleting a picture
bug:10551751
Change-Id: I9b6a8488b4fa2a3440b85ae8e4c5dc3da83e29f1
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 96b0a5dd8..8f7b1ed73 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -794,7 +794,8 @@ public abstract class PhotoPage extends ActivityState implements mMediaSet.enumerateMediaItems(new MediaSet.ItemConsumer() { @Override public void consume(int index, MediaItem item) { - if (item.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE) { + if (item != null + && item.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE) { count[0]++; } } |