summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoDataAdapter.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-01-16 14:10:30 -0800
committerJohn Reck <jreck@google.com>2013-01-16 18:05:07 -0800
commitf4f43e7dbc85ab8b7437e8f1d6ab0317470e70b6 (patch)
tree52bf0103140bbe996165b07c5313a39828ed895d /src/com/android/gallery3d/app/PhotoDataAdapter.java
parent48d4284a9ce804ba00b22e587a8b3d27ef9928c1 (diff)
downloadandroid_packages_apps_Gallery2-f4f43e7dbc85ab8b7437e8f1d6ab0317470e70b6.tar.gz
android_packages_apps_Gallery2-f4f43e7dbc85ab8b7437e8f1d6ab0317470e70b6.tar.bz2
android_packages_apps_Gallery2-f4f43e7dbc85ab8b7437e8f1d6ab0317470e70b6.zip
New loading model
Rename reload() to loadIfDirty() loadIfDirty is implemented by MediaSet and is final loadIfDirty is now blocking instead of async Subclasses must implement two protected methods, isDirtyLocked() and load() The change from async reload() to sync loadIfDirty() should be fine since all users of reload() were doing so from a background thread already, and the longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoDataAdapter.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoDataAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java
index 2b586da94..faff14674 100644
--- a/src/com/android/gallery3d/app/PhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java
@@ -1033,7 +1033,7 @@ public class PhotoDataAdapter implements PhotoPage.Model {
mDirty = false;
UpdateInfo info = executeAndWait(new GetUpdateInfo());
updateLoading(true);
- long version = mSource.reload();
+ long version = mSource.loadIfDirty();
if (info.version != version) {
info.reloadContent = true;
info.size = mSource.getMediaItemCount();