Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8589c1c3 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Recheck the condition before really killing" am: f24ac738 am:... 

Merge "Recheck the condition before really killing" am: f24ac738 am: c2cbdc70 am: 7c944d37 am: e90bb605

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



Change-Id: Iba973612f5abc32b539375f53b330cd54f35acd0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 760a121a e90bb605

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

+8 −0
Original line number Diff line number Diff line
@@ -15236,6 +15236,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,
@@ -15261,6 +15265,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,