From fa434b0ece14ed98eb0e25d3a13374720d641709 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Sun, 30 Sep 2012 14:09:30 -0700 Subject: More logs for gallery crash error, remove a potential cause Bug: 7216012 Made sure that FilterDeleteSet doesn't ever return stale item counts, added extra logging in LocalMergeAlbum for NoSuchElementException so that we can have more info to diagnose this crash if it happens in the future. Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03 --- src/com/android/gallery3d/data/FilterDeleteSet.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/com/android/gallery3d/data/FilterDeleteSet.java') diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java index fc44d48c4..c76412ff8 100644 --- a/src/com/android/gallery3d/data/FilterDeleteSet.java +++ b/src/com/android/gallery3d/data/FilterDeleteSet.java @@ -63,13 +63,11 @@ public class FilterDeleteSet extends MediaSet implements ContentListener { // Deletions currently in effect, ordered by index private ArrayList mCurrent = new ArrayList(); - private int mMediaItemCount; public FilterDeleteSet(Path path, MediaSet baseSet) { super(path, INVALID_DATA_VERSION); mBaseSet = baseSet; mBaseSet.addContentListener(this); - mMediaItemCount = mBaseSet.getMediaItemCount() - mCurrent.size(); } @Override @@ -84,7 +82,7 @@ public class FilterDeleteSet extends MediaSet implements ContentListener { @Override public int getMediaItemCount() { - return mMediaItemCount; + return mBaseSet.getMediaItemCount() - mCurrent.size(); } // Gets the MediaItems whose (post-deletion) index are in the range [start, @@ -221,7 +219,6 @@ public class FilterDeleteSet extends MediaSet implements ContentListener { mCurrent = result; } - mMediaItemCount = mBaseSet.getMediaItemCount() - mCurrent.size(); mDataVersion = nextVersionNumber(); return mDataVersion; } -- cgit v1.2.3