am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev (3de5ed51) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -9349,6 +9349,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		checkTime(startTime, "getContentProviderImpl: after getProviderByClass");
		final boolean firstClass = cpr == null;
		if (firstClass) {
		final long ident = Binder.clearCallingIdentity();
		try {
		checkTime(startTime, "getContentProviderImpl: before getApplicationInfo");
		ApplicationInfo ai =
		@@ -9366,6 +9367,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		cpr = new ContentProviderRecord(this, cpi, ai, comp, singleton);
		} catch (RemoteException ex) {
		// pm is in same process, this will never happen.
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}