diff options
| author | Owen Lin <owenlin@google.com> | 2012-09-02 23:27:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-02 23:27:28 -0700 |
| commit | dc433a066188e52593aaf7f0fae96191f44a5e26 (patch) | |
| tree | 0abeb3fdc6641bebfc5c3f8d54c9e67a45f9f72a /src/com/android | |
| parent | b38af94687799862863ef10de91ade4683721dd2 (diff) | |
| parent | aaad70913d88b943ac2dada2ee7b3e11c2c9d246 (diff) | |
| download | android_packages_apps_Snap-dc433a066188e52593aaf7f0fae96191f44a5e26.tar.gz android_packages_apps_Snap-dc433a066188e52593aaf7f0fae96191f44a5e26.tar.bz2 android_packages_apps_Snap-dc433a066188e52593aaf7f0fae96191f44a5e26.zip | |
Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
Diffstat (limited to 'src/com/android')
| -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; } |