diff options
author | John Reck <jreck@google.com> | 2013-03-22 00:38:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-22 00:38:53 +0000 |
commit | dc19e2f107b02b62f887dc500e107ad8f4a9cb07 (patch) | |
tree | d4ef5575e5d2459462cd4d35aa1052779cbdc9a1 /src/com/android/gallery3d/data/SecureAlbum.java | |
parent | 400f35866b8758118e35541aa834b93fcfc5d1be (diff) | |
parent | 51177aac9078da153bcb191864fb368faf105681 (diff) | |
download | android_packages_apps_Snap-dc19e2f107b02b62f887dc500e107ad8f4a9cb07.tar.gz android_packages_apps_Snap-dc19e2f107b02b62f887dc500e107ad8f4a9cb07.tar.bz2 android_packages_apps_Snap-dc19e2f107b02b62f887dc500e107ad8f4a9cb07.zip |
Merge "Revert "New loading model"" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/data/SecureAlbum.java')
-rw-r--r-- | src/com/android/gallery3d/data/SecureAlbum.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/data/SecureAlbum.java b/src/com/android/gallery3d/data/SecureAlbum.java index 04d51d11c..204f848f8 100644 --- a/src/com/android/gallery3d/data/SecureAlbum.java +++ b/src/com/android/gallery3d/data/SecureAlbum.java @@ -122,13 +122,12 @@ public class SecureAlbum extends MediaSet implements StitchingChangeListener { } @Override - protected boolean isDirtyLocked() { - return mNotifier.isDirty(); - } - - @Override - public void load() { - updateExistingItems(); + public long reload() { + if (mNotifier.isDirty()) { + mDataVersion = nextVersionNumber(); + updateExistingItems(); + } + return mDataVersion; } private ArrayList<Integer> queryExistingIds(Uri uri, int minId, int maxId) { |