Merge "Maybe fix issue #12957738: SecurityException in..." (7f477021) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+20 −15

Original line number	Original line	Diff line number	Diff line
	@@ -7755,6 +7755,8 @@ public final class ActivityManagerService extends ActivityManagerNative
	*/		*/
	public void removeContentProvider(IBinder connection, boolean stable) {		public void removeContentProvider(IBinder connection, boolean stable) {
	enforceNotIsolatedCaller("removeContentProvider");		enforceNotIsolatedCaller("removeContentProvider");
			long ident = Binder.clearCallingIdentity();
			try {
	synchronized (this) {		synchronized (this) {
	ContentProviderConnection conn;		ContentProviderConnection conn;
	try {		try {
	@@ -7772,6 +7774,9 @@ public final class ActivityManagerService extends ActivityManagerNative
	updateOomAdjLocked();		updateOomAdjLocked();
	}		}
	}		}
			} finally {
			Binder.restoreCallingIdentity(ident);
			}
	}		}

	public void removeContentProviderExternal(String name, IBinder token) {		public void removeContentProviderExternal(String name, IBinder token) {