Merge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev (ba032c78) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/content/ContentService.java

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -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");