diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-02 12:37:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-02 12:37:23 -0700 |
| commit | 5cae45863dcfec9538fb0cc3606e5119a92f9185 (patch) | |
| tree | 595a8d1770c656bcf078569dfaf2e714c3a0a457 | |
| parent | 3f7cff4506d3ac27373dcad84e3c6bb73acb0ec5 (diff) | |
| parent | 6423defee1d8ccf4d462d40ae4f82c7d73b11ab5 (diff) | |
| download | android_packages_apps_Gallery2-5cae45863dcfec9538fb0cc3606e5119a92f9185.tar.gz android_packages_apps_Gallery2-5cae45863dcfec9538fb0cc3606e5119a92f9185.tar.bz2 android_packages_apps_Gallery2-5cae45863dcfec9538fb0cc3606e5119a92f9185.zip | |
am 6423defe: Fix crash, remove logging added to diagnose bug
* commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5':
Fix crash, remove logging added to diagnose bug
| -rw-r--r-- | src/com/android/gallery3d/data/LocalMergeAlbum.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/data/LocalMergeAlbum.java b/src/com/android/gallery3d/data/LocalMergeAlbum.java index 14c1c6e6b..cbaf82fff 100644 --- a/src/com/android/gallery3d/data/LocalMergeAlbum.java +++ b/src/com/android/gallery3d/data/LocalMergeAlbum.java @@ -59,6 +59,7 @@ public class LocalMergeAlbum extends MediaSet implements ContentListener { for (MediaSet set : mSources) { set.addContentListener(this); } + reload(); } @Override @@ -123,17 +124,7 @@ public class LocalMergeAlbum extends MediaSet implements ContentListener { // First find the nearest mark position <= start. SortedMap<Integer, int[]> head = mIndex.headMap(start + 1); - int markPos; - try { - markPos = head.lastKey(); - } catch (NoSuchElementException e) { - Log.e(TAG, "getMediaItem("+start+","+count+") failed"); - Log.e(TAG, "mSources: "); - for (MediaSet set : mSources) { - Log.e(TAG, "\t"+set.getPath()); - } - throw e; - } + int markPos = head.lastKey(); int[] subPos = head.get(markPos).clone(); MediaItem[] slot = new MediaItem[mSources.length]; |