Merge "Recheck the condition before really killing" (f24ac738) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -14372,6 +14372,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		app.processName, app.toShortString(), cpuLimit, app)) {
		mHandler.post(() -> {
		synchronized (ActivityManagerService.this) {
		if (app.getThread() == null
		\|\| app.mState.getSetProcState() < ActivityManager.PROCESS_STATE_HOME) {
		return;
		}
		app.killLocked("excessive cpu " + cpuTimeUsed + " during "
		+ uptimeSince + " dur=" + checkDur + " limit=" + cpuLimit,
		ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE,
		@@ -14397,6 +14401,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		app.processName, r.toString(), cpuLimit, app)) {
		mHandler.post(() -> {
		synchronized (ActivityManagerService.this) {
		if (app.getThread() == null
		\|\| app.mState.getSetProcState() < ActivityManager.PROCESS_STATE_HOME) {
		return;
		}
		mPhantomProcessList.killPhantomProcessGroupLocked(app, r,
		ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE,
		ApplicationExitInfo.SUBREASON_EXCESSIVE_CPU,