summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2016-08-19 15:53:19 +0800
committerSteve Kondik <steve@cyngn.com>2016-09-26 04:54:49 -0700
commit11727bd35d9dd19dac3a98ef810aaf3adad7ac89 (patch)
tree244acad4dd2d9a82b482425945397b970e18a06f
parent75d013488246a7631abc99dd77b7685d0e2b1b00 (diff)
downloadandroid_packages_apps_Gallery2-11727bd35d9dd19dac3a98ef810aaf3adad7ac89.tar.gz
android_packages_apps_Gallery2-11727bd35d9dd19dac3a98ef810aaf3adad7ac89.tar.bz2
android_packages_apps_Gallery2-11727bd35d9dd19dac3a98ef810aaf3adad7ac89.zip
SnapdragonGallery: Fix crash when slide up to delete photos
Add judgment for index out of bounds Change-Id: Ib42801817220e4a7219903da0eb792b92ea2cf89 CRs-Fixed: 1056237
-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 f7329739d..5a752a9ed 100644
--- a/src/com/android/gallery3d/data/FilterDeleteSet.java
+++ b/src/com/android/gallery3d/data/FilterDeleteSet.java
@@ -136,7 +136,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;
}