Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't dispatch Uris with appended user handle" into nyc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-06-17 21:51:33 +00:00
committed by Android (Google) Code Review
parent b1f3404f8f 3138a9938b
commit 7ef9f61be6
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/content/ContentService.java
View File

@@ -394,18 +394,9 @@ public final class ContentService extends IContentService.Stub {
for (int i=0; i<numCalls; i++) { for (int i=0; i<numCalls; i++) {
ObserverCall oc = calls.get(i); ObserverCall oc = calls.get(i);
try { try {
// If the uri does not belong to the same user as the observer: we must add oc.mObserver.onChange(oc.mSelfChange, uri, userHandle);
// the userId to the uri. Otherewise the observer would think the uri belongs
// to his user.
final Uri tempUri;
if (oc.mObserverUserId != userHandle) {
tempUri = ContentProvider.maybeAddUserId(uri, userHandle);
} else {
tempUri = uri;
}
oc.mObserver.onChange(oc.mSelfChange, tempUri, userHandle);
if (DEBUG) Slog.d(TAG, "Notified " + oc.mObserver + " of " + "update at " if (DEBUG) Slog.d(TAG, "Notified " + oc.mObserver + " of " + "update at "
+ tempUri); + uri);
} catch (RemoteException ex) { } catch (RemoteException ex) {
synchronized (mRootNode) { synchronized (mRootNode) {
Log.w(TAG, "Found dead observer, removing"); Log.w(TAG, "Found dead observer, removing");