diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-06-30 07:45:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-30 07:45:50 +0000 |
| commit | 01b079f7d2dff0c9230e0f58842a473dc8c2cd06 (patch) | |
| tree | 7ee381d851913b4323729b9eeed144da6ad37bcb /core/java/android/content | |
| parent | 5a6f2136777bd8c62b0e5b5b48138a56c789a4a9 (diff) | |
| parent | adea1918bef942b6214cf549b1316affd2b10280 (diff) | |
| download | frameworks_base-01b079f7d2dff0c9230e0f58842a473dc8c2cd06.zip frameworks_base-01b079f7d2dff0c9230e0f58842a473dc8c2cd06.tar.gz frameworks_base-01b079f7d2dff0c9230e0f58842a473dc8c2cd06.tar.bz2 | |
Merge "Make ContentObservers work across profiles" into mnc-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index d37dda0..6ede29b 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -1593,7 +1593,11 @@ public abstract class ContentResolver { @NonNull ContentObserver observer) { Preconditions.checkNotNull(uri, "uri"); Preconditions.checkNotNull(observer, "observer"); - registerContentObserver(uri, notifyForDescendents, observer, UserHandle.myUserId()); + registerContentObserver( + ContentProvider.getUriWithoutUserId(uri), + notifyForDescendents, + observer, + ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId())); } /** @hide - designated user version */ @@ -1659,7 +1663,11 @@ public abstract class ContentResolver { public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer, boolean syncToNetwork) { Preconditions.checkNotNull(uri, "uri"); - notifyChange(uri, observer, syncToNetwork, UserHandle.myUserId()); + notifyChange( + ContentProvider.getUriWithoutUserId(uri), + observer, + syncToNetwork, + ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId())); } /** |