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

Commit faf7e29c authored by Varun Shah's avatar Varun Shah Committed by Automerger Merge Worker
Browse files

Merge "Fix swapped backup/heavy oom adj labels" am: e816d004 am: 66243c93... 

Merge "Fix swapped backup/heavy oom adj labels" am: e816d004 am: 66243c93 am: 391b7b41 am: 11bf501d

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



Change-Id: I1dc78a83182eaa5f734b383ce1ebf23998b27db4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5681af59 11bf501d

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

+2 −2
Original line number Diff line number Diff line
@@ -10850,7 +10850,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            "Native",

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

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

            "Heavy Weight", "Backup",

            "Backup", "Heavy Weight",

            "A Services", "Home",

            "Previous", "B Services", "Cached"

    };
@@ -10858,7 +10858,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            "native",

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

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

            "heavy", "backup",

            "backup", "heavy",

            "servicea", "home",

            "prev", "serviceb", "cached"

    };