summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-03-18 22:22:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-18 22:22:42 +0000
commit9a5c1beb3b8f5586a91b465fb013d6c4cea6b87c (patch)
treeb0f71becef70207466a61125d10e8e62dae430dc /src
parent96be5d9e7c66b64f9dd24a29eb0fb69ebd920106 (diff)
parent246781394544be41ce315293b6f67302b3504c87 (diff)
downloadandroid_packages_apps_Snap-9a5c1beb3b8f5586a91b465fb013d6c4cea6b87c.tar.gz
android_packages_apps_Snap-9a5c1beb3b8f5586a91b465fb013d6c4cea6b87c.tar.bz2
android_packages_apps_Snap-9a5c1beb3b8f5586a91b465fb013d6c4cea6b87c.zip
Merge "Fix notifyChange" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/photos/data/PhotoProvider.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/photos/data/PhotoProvider.java b/src/com/android/photos/data/PhotoProvider.java
index 3e751e0fc..7e95688f2 100644
--- a/src/com/android/photos/data/PhotoProvider.java
+++ b/src/com/android/photos/data/PhotoProvider.java
@@ -356,7 +356,11 @@ public class PhotoProvider extends SQLiteContentProvider {
selection = addIdToSelection(match, selection);
selectionArgs = addIdToSelectionArgs(match, uri, selectionArgs);
String table = getTableFromMatch(match, uri);
- return query(table, projection, selection, selectionArgs, sortOrder, cancellationSignal);
+ Cursor c = query(table, projection, selection, selectionArgs, sortOrder, cancellationSignal);
+ if (c != null) {
+ c.setNotificationUri(getContext().getContentResolver(), uri);
+ }
+ return c;
}
@Override
@@ -481,7 +485,7 @@ public class PhotoProvider extends SQLiteContentProvider {
if (mNotifier != null) {
mNotifier.notifyChange(uri, syncToNetwork);
} else {
- resolver.notifyChange(uri, null, syncToNetwork);
+ super.notifyChange(resolver, uri, syncToNetwork);
}
}