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

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

Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into... 

Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f

Change-Id: Ic3b2140967baeca629b6d4fbbe276a9de95f1c56
parents b86a44f8 e72bd54f

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

+5 −3
Original line number Diff line number Diff line
@@ -1260,9 +1260,11 @@ public final class OomAdjuster { 
            // value that the caller wants us to.

            adj = cachedAdj;

            procState = PROCESS_STATE_CACHED_EMPTY;

            if (!app.containsCycle) {

                app.setCached(true);

                app.empty = true;

                app.adjType = "cch-empty";

            }

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making empty: " + app);

            }

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+9 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,15 @@ public class MockingOomAdjusterTests { 
                SCHED_GROUP_DEFAULT);

        assertProcStates(app3, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,

                SCHED_GROUP_DEFAULT);

        assertEquals("service", app.adjType);

        assertEquals("service", app2.adjType);

        assertEquals("fg-service", app3.adjType);

        assertEquals(false, app.isCached());

        assertEquals(false, app2.isCached());

        assertEquals(false, app3.isCached());

        assertEquals(false, app.empty);

        assertEquals(false, app2.empty);

        assertEquals(false, app3.empty);

    }



    @SuppressWarnings("GuardedBy")