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

Commit ea036c84 authored by Jing Ji's avatar Jing Ji
Browse files

Don't reset OOM adjType to cch-empty during recomputing on cycles 

The first pass should have an equivalent or better value for it.
During oom recomputing on cycles, if the result of recomputation
is no better than the given 'cachedAdj', its adjType won't be updated,
therefore we'd need to keep its current value as is.

Bug: 156123244
Test: atest MockingOomAdjusterTests
Test: atest FrameworksServicesTests:ActivityManagerServiceTest
Test: atest CtsAppTestCases:ActivityManagerProcessStateTest
Test: Manual - adb shell dumpsys activity oom
Change-Id: Ic4adf76656575926d16c0a037d955795061116e3
parent 851415b6

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")