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

Commit 73bfd28e authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "[BugFixed][OOM_ADJ] use max_adj to control process final adj" am:... 

Merge "[BugFixed][OOM_ADJ] use max_adj to control process final adj" am: 2d361f63 am: 5b474f61 am: 086bba93

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



Change-Id: If66bd7f85cc5bd97a4982a7484c814bcac7174d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 859bea28 086bba93

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2620,7 +2620,7 @@ public class OomAdjuster { 
        }

        }





        state.setCurRawAdj(adj);

        state.setCurRawAdj(adj);



        adj = psr.modifyRawOomAdj(adj);

        if (adj > state.getMaxAdj()) {

        if (adj > state.getMaxAdj()) {

            adj = state.getMaxAdj();

            adj = state.getMaxAdj();

            if (adj <= PERCEPTIBLE_LOW_APP_ADJ) {

            if (adj <= PERCEPTIBLE_LOW_APP_ADJ) {
@@ -2650,7 +2650,7 @@ public class OomAdjuster { 
        // it when computing the final cached adj later.  Note that we don't need to

        // it when computing the final cached adj later.  Note that we don't need to

        // worry about this for max adj above, since max adj will always be used to

        // worry about this for max adj above, since max adj will always be used to

        // keep it out of the cached vaues.

        // keep it out of the cached vaues.

        state.setCurAdj(psr.modifyRawOomAdj(adj));

        state.setCurAdj(adj);

        state.setCurCapability(capability);

        state.setCurCapability(capability);

        state.setCurrentSchedulingGroup(schedGroup);

        state.setCurrentSchedulingGroup(schedGroup);

        state.setCurProcState(procState);

        state.setCurProcState(procState);