resolve merge conflicts of 44e07e0 to mnc-dev (3c402740) · Commits · e / os / android_frameworks_base

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

+9 −5

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);
		Process.killProcessGroup(app.uid, app.pid);
		killProcessGroup(app.uid, app.pid);
		}
		if (lrui <= mLruProcessActivityStart) {
		mLruProcessActivityStart--;
		@@ -3388,7 +3388,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");
		Process.killProcessGroup(app.uid, app.pid);
		killProcessGroup(app.uid, app.pid);
		handleAppDiedLocked(app, true, true);
		checkTime(startTime, "startProcess: done killing old proc");
		}
		@@ -4920,9 +4920,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		stats.noteProcessDiedLocked(app.info.uid, pid);
		}

		if (!app.killed) {
		if (!fromBinderDied) {
		Process.killProcessQuiet(pid);
		Process.killProcessGroup(app.uid, pid);
		}
		killProcessGroup(app.uid, pid);
		app.killed = true;
		}

		// Clean up already done if the process has been re-started.
		if (app.pid == pid && app.thread != null &&