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

Commit 0567ec63 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Add a constant for low perceptible adj 

NotificationListeners were moved to below FGS so
that they could be killed to relieve memory pressure.
Adding a proper place for it at oom adj 250.

Bug: 79848281
Test: Verify oom_adj value using dumpsys activity

Change-Id: I6059243b50921a696e967d88a7b21cbc6107856b
parent 72be7c2a

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

+17 −14
Original line number Diff line number Diff line
@@ -6549,7 +6549,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                conn = incProviderCountLocked(r, cpr, token, callingUid, callingPackage, callingTag,

                        stable);

                if (conn != null && (conn.stableCount+conn.unstableCount) == 1) {

                    if (cpr.proc != null && r.setAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) {

                    if (cpr.proc != null && r.setAdj <= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {

                        // If this is a perceptible app accessing the provider,

                        // make sure to count it as being accessed and thus

                        // back up on the LRU list.  This is good because
@@ -10828,6 +10828,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            printOomLevel(pw, "FOREGROUND_APP_ADJ", ProcessList.FOREGROUND_APP_ADJ);

            printOomLevel(pw, "VISIBLE_APP_ADJ", ProcessList.VISIBLE_APP_ADJ);

            printOomLevel(pw, "PERCEPTIBLE_APP_ADJ", ProcessList.PERCEPTIBLE_APP_ADJ);

            printOomLevel(pw, "PERCEPTIBLE_LOW_APP_ADJ", ProcessList.PERCEPTIBLE_LOW_APP_ADJ);

            printOomLevel(pw, "BACKUP_APP_ADJ", ProcessList.BACKUP_APP_ADJ);

            printOomLevel(pw, "HEAVY_WEIGHT_APP_ADJ", ProcessList.HEAVY_WEIGHT_APP_ADJ);

            printOomLevel(pw, "SERVICE_ADJ", ProcessList.SERVICE_ADJ);
@@ -10885,6 +10886,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                reportLmkKillAtOrBelow(pw, ProcessList.SERVICE_ADJ) &&

                reportLmkKillAtOrBelow(pw, ProcessList.HEAVY_WEIGHT_APP_ADJ) &&

                reportLmkKillAtOrBelow(pw, ProcessList.BACKUP_APP_ADJ) &&

                reportLmkKillAtOrBelow(pw, ProcessList.PERCEPTIBLE_LOW_APP_ADJ) &&

                reportLmkKillAtOrBelow(pw, ProcessList.PERCEPTIBLE_APP_ADJ) &&

                reportLmkKillAtOrBelow(pw, ProcessList.VISIBLE_APP_ADJ) &&

                reportLmkKillAtOrBelow(pw, ProcessList.FOREGROUND_APP_ADJ);
@@ -11760,7 +11762,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
            ProcessList.NATIVE_ADJ,

            ProcessList.SYSTEM_ADJ, ProcessList.PERSISTENT_PROC_ADJ,

            ProcessList.PERSISTENT_SERVICE_ADJ, ProcessList.FOREGROUND_APP_ADJ,

            ProcessList.VISIBLE_APP_ADJ, ProcessList.PERCEPTIBLE_APP_ADJ,

            ProcessList.VISIBLE_APP_ADJ,

            ProcessList.PERCEPTIBLE_APP_ADJ, ProcessList.PERCEPTIBLE_LOW_APP_ADJ,

            ProcessList.BACKUP_APP_ADJ, ProcessList.HEAVY_WEIGHT_APP_ADJ,

            ProcessList.SERVICE_ADJ, ProcessList.HOME_APP_ADJ,

            ProcessList.PREVIOUS_APP_ADJ, ProcessList.SERVICE_B_ADJ, ProcessList.CACHED_APP_MIN_ADJ
@@ -11768,7 +11771,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    static final String[] DUMP_MEM_OOM_LABEL = new String[] {

            "Native",

            "System", "Persistent", "Persistent Service", "Foreground",

            "Visible", "Perceptible",

            "Visible", "Perceptible", "Perceptible Low",

            "Heavy Weight", "Backup",

            "A Services", "Home",

            "Previous", "B Services", "Cached"
@@ -11776,7 +11779,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    static final String[] DUMP_MEM_OOM_COMPACT_LABEL = new String[] {

            "native",

            "sys", "pers", "persvc", "fore",

            "vis", "percept",

            "vis", "percept", "perceptl",

            "heavy", "backup",

            "servicea", "home",

            "prev", "serviceb", "cached"

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

+3 −3
Original line number Diff line number Diff line
@@ -1224,8 +1224,8 @@ public final class OomAdjuster { 
                                    }

                                } else if ((cr.flags & Context.BIND_ADJUST_BELOW_PERCEPTIBLE) != 0

                                        && clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ

                                        && adj > ProcessList.PERCEPTIBLE_APP_ADJ + 1) {

                                    newAdj = ProcessList.PERCEPTIBLE_APP_ADJ + 1;

                                        && adj > ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {

                                    newAdj = ProcessList.PERCEPTIBLE_LOW_APP_ADJ;

                                } else if ((cr.flags&Context.BIND_NOT_VISIBLE) != 0

                                        && clientAdj < ProcessList.PERCEPTIBLE_APP_ADJ

                                        && adj > ProcessList.PERCEPTIBLE_APP_ADJ) {
@@ -1610,7 +1610,7 @@ public final class OomAdjuster { 
        //      " adj=" + adj + " curAdj=" + app.curAdj + " maxAdj=" + app.maxAdj);

        if (adj > app.maxAdj) {

            adj = app.maxAdj;

            if (app.maxAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) {

            if (app.maxAdj <= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {

                schedGroup = ProcessList.SCHED_GROUP_DEFAULT;

            }

        }

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

+7 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ public final class ProcessList { 
    // is not entirely fatal but is generally a bad idea.

    static final int BACKUP_APP_ADJ = 300;



    // This is a process bound by the system that's more important than services but not so

    // perceptible that it affects the user immediately if killed.

    static final int PERCEPTIBLE_LOW_APP_ADJ = 250;



    // This is a process only hosting components that are perceptible to the

    // user, and we really want to avoid killing them, but they are not

    // immediately visible. An example is background music playback.
@@ -717,6 +721,9 @@ public final class ProcessList { 
        } else if (setAdj >= ProcessList.BACKUP_APP_ADJ) {

            return buildOomTag("bkup  ", "bkup", null, setAdj,

                    ProcessList.BACKUP_APP_ADJ, compact);

        } else if (setAdj >= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {

            return buildOomTag("prcl  ", "prcl", null, setAdj,

                    ProcessList.PERCEPTIBLE_LOW_APP_ADJ, compact);

        } else if (setAdj >= ProcessList.PERCEPTIBLE_APP_ADJ) {

            return buildOomTag("prcp  ", "prcp", null, setAdj,

                    ProcessList.PERCEPTIBLE_APP_ADJ, compact);

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

+2 −0
Original line number Diff line number Diff line
@@ -713,6 +713,8 @@ final class ProcessRecord implements WindowProcessListener { 
                adj = ProcessList.VISIBLE_APP_ADJ;

            } else if (adj < ProcessList.PERCEPTIBLE_APP_ADJ) {

                adj = ProcessList.PERCEPTIBLE_APP_ADJ;

            } else if (adj < ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {

                adj = ProcessList.PERCEPTIBLE_LOW_APP_ADJ;

            } else if (adj < ProcessList.CACHED_APP_MIN_ADJ) {

                adj = ProcessList.CACHED_APP_MIN_ADJ;

            } else if (adj < ProcessList.CACHED_APP_MAX_ADJ) {