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

Commit 66243c93 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 

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



Change-Id: Ic76d235b1d30f559b1085a673df3fb41e3a8d55c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 295fde95 e816d004

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

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

            "Native",

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

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

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

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

            "Heavy Weight", "Backup",

            "Backup", "Heavy Weight",

            "A Services", "Home",

            "A Services", "Home",

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

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

    };

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

            "native",

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

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

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

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

            "heavy", "backup",

            "backup", "heavy",

            "servicea", "home",

            "servicea", "home",

            "prev", "serviceb", "cached"

            "prev", "serviceb", "cached"

    };

    };