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

Commit a32797ce authored by Jing Ji's avatar Jing Ji
Browse files

Kill the process with pending task removal on OomAdjuster updates 

Fix the issue where it was checking for the "set" process state,
which means the process will be killed when next time this app
is being background.

Bug: 339697954
Test: Manual
Change-Id: I6bef56445497d2edcb59a44a6d42dcdb027a6126
parent 721670be

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

+61 −63
Original line number Diff line number Diff line
@@ -3268,7 +3268,13 @@ public class OomAdjuster { 
        }



        final int curSchedGroup = state.getCurrentSchedulingGroup();

        if (state.getSetSchedGroup() != curSchedGroup) {

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

                && ActivityManager.isProcStateBackground(state.getCurProcState())

                && !state.hasStartedServices()) {

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

                    ApplicationExitInfo.SUBREASON_REMOVE_TASK, true);

            success = false;

        } else if (state.getSetSchedGroup() != curSchedGroup) {

            int oldSchedGroup = state.getSetSchedGroup();

            state.setSetSchedGroup(curSchedGroup);

            if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.uid) {
@@ -3276,13 +3282,6 @@ public class OomAdjuster { 
                        + " to " + curSchedGroup + ": " + state.getAdjType();

                reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);

            }

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

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

                    && !state.hasStartedServices()) {

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

                        ApplicationExitInfo.SUBREASON_REMOVE_TASK, true);

                success = false;

            } else {

            int processGroup;

            switch (curSchedGroup) {

                case SCHED_GROUP_BACKGROUND:
@@ -3346,7 +3345,6 @@ public class OomAdjuster { 
                }

            }

        }

        }

        if (state.hasRepForegroundActivities() != state.hasForegroundActivities()) {

            state.setRepForegroundActivities(state.hasForegroundActivities());

            changes |= ActivityManagerService.ProcessChangeItem.CHANGE_ACTIVITIES;