Clear binder id after a permissions check before killing a UID. (0507d6b8) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -11045,9 +11045,15 @@ public final class ActivityManagerService extends ActivityManagerNative
	public void killUid(int uid, String reason) {		public void killUid(int uid, String reason) {
	enforceCallingPermission(Manifest.permission.KILL_UID, "killUid");		enforceCallingPermission(Manifest.permission.KILL_UID, "killUid");
	synchronized (this) {		synchronized (this) {
	killPackageProcessesLocked(null, UserHandle.getAppId(uid), UserHandle.getUserId(uid),		final long identity = Binder.clearCallingIdentity();
	ProcessList.FOREGROUND_APP_ADJ-1, false, true, true, false,		try {
			killPackageProcessesLocked(null, UserHandle.getAppId(uid),
			UserHandle.getUserId(uid),
			ProcessList.PERSISTENT_PROC_ADJ, false, true, true, true,
	reason != null ? reason : "kill uid");		reason != null ? reason : "kill uid");
			} finally {
			Binder.restoreCallingIdentity(identity);
			}
	}		}
	}		}