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

Commit 383f0e7d authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Check for current procState before demoting it." into udc-dev am: f1a43684 am: d51a295f 

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



Change-Id: I6ecc0f88a62e9295b348aa291e6a9e7f14a1df93
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35d6e5e1 d51a295f

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

+3 −2
Original line number Diff line number Diff line
@@ -2048,8 +2048,9 @@ public class OomAdjuster { 
            // around switching between two apps. However, we don't want to keep the

            // process in this privileged state indefinitely. Eventually, allow the

            // app to be demoted to cached.

            if ((state.getSetProcState() == PROCESS_STATE_LAST_ACTIVITY

                    && (state.getLastStateTime() + mConstants.MAX_PREVIOUS_TIME) < now)) {

            if (procState >= PROCESS_STATE_LAST_ACTIVITY

                    && state.getSetProcState() == PROCESS_STATE_LAST_ACTIVITY

                    && (state.getLastStateTime() + mConstants.MAX_PREVIOUS_TIME) < now) {

                procState = PROCESS_STATE_LAST_ACTIVITY;

                schedGroup = SCHED_GROUP_BACKGROUND;

                state.setAdjType("previous-expired");