diff options
| author | zhuw <zhuw@codeaurora.org> | 2018-10-17 11:12:49 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-17 00:16:45 -0700 |
| commit | f1ccb05dbefb19f87d6a6e3abc5db40feb4462b5 (patch) | |
| tree | 421bdf3d06bfc22c469c1cc9c49cf59c89acb9ce | |
| parent | d661be8b145151b69ba2db7609acb8cdf31a3a8d (diff) | |
| download | android_packages_apps_Gallery2-f1ccb05dbefb19f87d6a6e3abc5db40feb4462b5.tar.gz android_packages_apps_Gallery2-f1ccb05dbefb19f87d6a6e3abc5db40feb4462b5.tar.bz2 android_packages_apps_Gallery2-f1ccb05dbefb19f87d6a6e3abc5db40feb4462b5.zip | |
fix monkey FC when delete item
if no key found in the map, return new list
Change-Id: I793f01a9ca7242b663fa90420d806352e50752ac
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/data/LocalMergeAlbum.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/LocalMergeAlbum.java b/src/com/android/gallery3d/data/LocalMergeAlbum.java index db981c3d7..40e8b8ef0 100644..100755 --- a/src/com/android/gallery3d/data/LocalMergeAlbum.java +++ b/src/com/android/gallery3d/data/LocalMergeAlbum.java @@ -121,7 +121,12 @@ public class LocalMergeAlbum extends MediaSet implements ContentListener { // First find the nearest mark position <= start. SortedMap<Integer, int[]> head = mIndex.headMap(start + 1); - int markPos = head.lastKey(); + int markPos; + try { + markPos = head.lastKey(); + } catch (NoSuchElementException e) { + return new ArrayList<MediaItem>(); + } int[] subPos = head.get(markPos).clone(); MediaItem[] slot = new MediaItem[mSources.length]; |