Merge "Kill the real/isolated uid group, not the ApplicationInfo uid" into nyc-dev (d93a6fa9) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3013,7 +3013,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (!app.killed) {
		Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);
		Process.killProcessQuiet(app.pid);
		killProcessGroup(app.info.uid, app.pid);
		killProcessGroup(app.uid, app.pid);
		}
		if (lrui <= mLruProcessActivityStart) {
		mLruProcessActivityStart--;
		@@ -3386,7 +3386,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		// clean it up now.
		if (DEBUG_PROCESSES \|\| DEBUG_CLEANUP) Slog.v(TAG_PROCESSES, "App died: " + app);
		checkTime(startTime, "startProcess: bad proc running, killing");
		killProcessGroup(app.info.uid, app.pid);
		killProcessGroup(app.uid, app.pid);
		handleAppDiedLocked(app, true, true);
		checkTime(startTime, "startProcess: done killing old proc");
		}
		@@ -5021,7 +5021,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (!fromBinderDied) {
		Process.killProcessQuiet(pid);
		}
		killProcessGroup(app.info.uid, pid);
		killProcessGroup(app.uid, pid);
		app.killed = true;
		}