diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoDataAdapter.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/FilterDeleteSet.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java index 0b7f34e70..36bde4dbd 100755 --- a/src/com/android/gallery3d/app/PhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java @@ -1309,10 +1309,10 @@ public class PhotoDataAdapter implements PhotoPage.Model { } mDirty = false; - version = mSource.reload(); if (mIsFromTimelineScreen) { mSource.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_NO_TITLE); } + version = mSource.reload(); //if data is not ready, continue to reload if (version == MediaObject.INVALID_DATA_VERSION) { continue; diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java index 5c34fda70..799ea0e16 100644 --- a/src/com/android/gallery3d/data/FilterDeleteSet.java +++ b/src/com/android/gallery3d/data/FilterDeleteSet.java @@ -138,7 +138,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; } |