summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-03-21 20:01:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-21 20:01:12 +0000
commit03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2 (patch)
tree7f888df476c3778f0420cde2b4865032d02626a2
parentbc8d55d07dd85f65a08a7b817cd22662b2999189 (diff)
parenta3b520678f0ad543847f81d23db580b89bc008ed (diff)
downloadandroid_packages_apps_Snap-03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2.tar.gz
android_packages_apps_Snap-03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2.tar.bz2
android_packages_apps_Snap-03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2.zip
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
-rw-r--r--src/com/android/photos/data/SQLiteContentProvider.java3
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) {