diff options
| author | John Reck <jreck@google.com> | 2013-03-21 20:01:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-21 20:01:12 +0000 |
| commit | d6db9403125261d46e410db60b8a25f1d9014d2b (patch) | |
| tree | ce5f80dd6bc68098a210fcbed37d1c889146a862 /src/com/android/photos | |
| parent | 8b65a2a7a415f80e54f993973661b4060e6384f5 (diff) | |
| parent | 1a7caec663cedddf4fc80f2f33bc2eb8944a6f38 (diff) | |
| download | android_packages_apps_Gallery2-d6db9403125261d46e410db60b8a25f1d9014d2b.tar.gz android_packages_apps_Gallery2-d6db9403125261d46e410db60b8a25f1d9014d2b.tar.bz2 android_packages_apps_Gallery2-d6db9403125261d46e410db60b8a25f1d9014d2b.zip | |
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/photos')
| -rw-r--r-- | src/com/android/photos/data/SQLiteContentProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/photos/data/SQLiteContentProvider.java b/src/com/android/photos/data/SQLiteContentProvider.java index ecd868b52..daffa6e79 100644 --- a/src/com/android/photos/data/SQLiteContentProvider.java +++ b/src/com/android/photos/data/SQLiteContentProvider.java @@ -241,7 +241,7 @@ public abstract class SQLiteContentProvider extends ContentProvider { } } - protected void onEndTransaction(boolean callerIsSyncAdapter) { + protected Set<Uri> onEndTransaction(boolean callerIsSyncAdapter) { Set<Uri> changed; synchronized (mChangedUris) { changed = new HashSet<Uri>(mChangedUris); @@ -252,6 +252,7 @@ public abstract class SQLiteContentProvider extends ContentProvider { boolean syncToNetwork = !callerIsSyncAdapter && syncToNetwork(uri); notifyChange(resolver, uri, syncToNetwork); } + return changed; } protected void notifyChange(ContentResolver resolver, Uri uri, boolean syncToNetwork) { |