Merge "Remove Persistent proccess without WTFing" into pi-dev (4ea0a5a2) · Commits · e / os / android_frameworks_base

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

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3706,6 +3706,9 @@ public class ActivityManagerService extends IActivityManager.Stub
	int lrui = mLruProcesses.lastIndexOf(app);		int lrui = mLruProcesses.lastIndexOf(app);
	if (lrui >= 0) {		if (lrui >= 0) {
	if (!app.killed) {		if (!app.killed) {
			if (app.persistent) {
			Slog.w(TAG, "Removing persistent process that hasn't been killed: " + app);
			} else {
	Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);		Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);
	if (app.pid > 0) {		if (app.pid > 0) {
	killProcessQuiet(app.pid);		killProcessQuiet(app.pid);
	@@ -3714,6 +3717,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	app.pendingStart = false;		app.pendingStart = false;
	}		}
	}		}
			}
	if (lrui <= mLruProcessActivityStart) {		if (lrui <= mLruProcessActivityStart) {
	mLruProcessActivityStart--;		mLruProcessActivityStart--;
	}		}