Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
diff --git a/src/com/android/photos/data/SQLiteContentProvider.java b/src/com/android/photos/data/SQLiteContentProvider.java
index ecd868b..daffa6e 100644
--- a/src/com/android/photos/data/SQLiteContentProvider.java
+++ b/src/com/android/photos/data/SQLiteContentProvider.java
@@ -241,7 +241,7 @@
}
}
- 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 @@
boolean syncToNetwork = !callerIsSyncAdapter && syncToNetwork(uri);
notifyChange(resolver, uri, syncToNetwork);
}
+ return changed;
}
protected void notifyChange(ContentResolver resolver, Uri uri, boolean syncToNetwork) {
