From 11727bd35d9dd19dac3a98ef810aaf3adad7ac89 Mon Sep 17 00:00:00 2001 From: zhuw Date: Fri, 19 Aug 2016 15:53:19 +0800 Subject: SnapdragonGallery: Fix crash when slide up to delete photos Add judgment for index out of bounds Change-Id: Ib42801817220e4a7219903da0eb792b92ea2cf89 CRs-Fixed: 1056237 --- src/com/android/gallery3d/data/FilterDeleteSet.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3