summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2016-08-19 15:53:19 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-21 18:53:08 -0700
commit33c0d192e51fc2cf776ce19666907c7a751c9222 (patch)
tree10877adca3dc5a4b0d2e12cbf6e29ea315efe046 /src/com/android
parentfdc2cd8b3852f4f1f7ca7dc872587e0ee78790e8 (diff)
downloadandroid_packages_apps_Gallery2-33c0d192e51fc2cf776ce19666907c7a751c9222.tar.gz
android_packages_apps_Gallery2-33c0d192e51fc2cf776ce19666907c7a751c9222.tar.bz2
android_packages_apps_Gallery2-33c0d192e51fc2cf776ce19666907c7a751c9222.zip
SnapdragonGallery: Fix crash when slide up to delete photos
Add judgment for index out of bounds Change-Id: Ib42801817220e4a7219903da0eb792b92ea2cf89 CRs-Fixed: 1056237
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/gallery3d/data/FilterDeleteSet.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java
index 5c34fda70..799ea0e16 100644
--- a/src/com/android/gallery3d/data/FilterDeleteSet.java
+++ b/src/com/android/gallery3d/data/FilterDeleteSet.java
@@ -138,7 +138,9 @@ public class FilterDeleteSet extends MediaSet implements ContentListener {
for (int m = j - 1; m >= i; m--) {
Deletion d = mCurrent.get(m);
int k = d.index - (start + i);
- base.remove(k);
+ if (k >= 0 && k < base.size()) {
+ base.remove(k);
+ }
}
return base;
}