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

Commit a8aae5d9 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Check the process state for the killProcessesForRemovedTask"

parents ff45f159 f83f743e

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

+1 −1
Original line number Diff line number Diff line
@@ -16651,7 +16651,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    final WindowProcessController wpc =

                            (WindowProcessController) procsToKill.get(i);

                    final ProcessRecord pr = (ProcessRecord) wpc.mOwner;

                    if (pr.mState.getSetSchedGroup() == ProcessList.SCHED_GROUP_BACKGROUND

                    if (ActivityManager.isProcStateBackground(pr.mState.getSetProcState())

                            && pr.mReceivers.numberOfCurReceivers() == 0) {

                        pr.killLocked("remove task", ApplicationExitInfo.REASON_USER_REQUESTED,

                                ApplicationExitInfo.SUBREASON_REMOVE_TASK, true);

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

+1 −1
Original line number Diff line number Diff line
@@ -2597,7 +2597,7 @@ public class OomAdjuster { 
                reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);

            }

            if (app.getWaitingToKill() != null && app.mReceivers.numberOfCurReceivers() == 0

                    && state.getSetSchedGroup() == ProcessList.SCHED_GROUP_BACKGROUND) {

                    && ActivityManager.isProcStateBackground(state.getSetProcState())) {

                app.killLocked(app.getWaitingToKill(), ApplicationExitInfo.REASON_USER_REQUESTED,

                        ApplicationExitInfo.SUBREASON_REMOVE_TASK, true);

                success = false;