Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Recheck the condition before really killing" am: f24ac73825 am: c2cbdc7065

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2121361

Change-Id: Ie6d2d6958b27e59b3ccb9ca8f16d2e680758a8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2022-06-21 03:59:44 +00:00
committed by Automerger Merge Worker
parent b38e19fdc3 c2cbdc7065
commit 7c944d37a0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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