diff options
| author | Owen Lin <owenlin@google.com> | 2012-08-30 15:36:53 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2012-08-30 15:36:53 +0800 |
| commit | b9e41109f413768d6f8bb5ec7c14ca31fbc0c098 (patch) | |
| tree | e11f04a5ebac7cf18cf1d08d7d37c745f5b821d1 /src | |
| parent | bafebac3ac39ad2220f80448b3862d07d4bfcd74 (diff) | |
| download | android_packages_apps_Gallery2-b9e41109f413768d6f8bb5ec7c14ca31fbc0c098.tar.gz android_packages_apps_Gallery2-b9e41109f413768d6f8bb5ec7c14ca31fbc0c098.tar.bz2 android_packages_apps_Gallery2-b9e41109f413768d6f8bb5ec7c14ca31fbc0c098.zip | |
Fix NPE when deleting a photo in Clustering mode.
bug: 7075760
Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/data/MediaSet.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/MediaSet.java b/src/com/android/gallery3d/data/MediaSet.java index d5d1048e0..f92faa74e 100644 --- a/src/com/android/gallery3d/data/MediaSet.java +++ b/src/com/android/gallery3d/data/MediaSet.java @@ -136,7 +136,9 @@ public abstract class MediaSet extends MediaObject { protected int getIndexOf(Path path, ArrayList<MediaItem> list) { for (int i = 0, n = list.size(); i < n; ++i) { - if (list.get(i).mPath == path) return i; + // item could be null only in ClusterAlbum + MediaObject item = list.get(i); + if (item != null && item.mPath == path) return i; } return INDEX_NOT_FOUND; } |