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

Commit eadc49dd authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

Cleanup follow_up_oomadj_updates flag 

Flag: EXEMPT removing com.android.server.am.follow_up_oomadj_updates
Fixes: 409605562
Test: atest MockingOomAdjusterTests
Change-Id: Id228480501fe19a687657c55309fc8541bd0338d
parent 38d8a24e

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

+0 −3
Original line number Diff line number Diff line
@@ -2760,9 +2760,6 @@ public abstract class OomAdjuster { 
    @GuardedBy("mService")

    protected void maybeSetProcessFollowUpUpdateLocked(ProcessRecord proc,

            long updateUptimeMs, long now) {

        if (!Flags.followUpOomadjUpdates()) {

            return;

        }

        if (updateUptimeMs <= now) {

            // Time sensitive period has already passed. No need to schedule a follow up.

            return;

services/core/java/com/android/server/am/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -143,16 +143,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "follow_up_oomadj_updates"

    namespace: "backstage_power"

    description: "Schedule follow up OomAdjuster updates for time sensitive states."

    bug: "333450932"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "collect_logcat_on_run_synchronously"

    namespace: "stability"

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

+0 −14
Original line number Diff line number Diff line
@@ -934,8 +934,6 @@ public class MockingOomAdjusterTests { 
                PERCEPTIBLE_RECENT_FOREGROUND_APP_ADJ, SCHED_GROUP_DEFAULT, "fg-service-act");

        assertBfsl(app);



        if (!Flags.followUpOomadjUpdates()) return;



        final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

        verify(mService.mHandler).sendEmptyMessageAtTime(

                eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG), followUpTimeCaptor.capture());
@@ -971,8 +969,6 @@ public class MockingOomAdjusterTests { 


            assertEquals(PERCEPTIBLE_RECENT_FOREGROUND_APP_ADJ + 2, app.mState.getSetAdj());



            if (!Flags.followUpOomadjUpdates()) return;



            final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

            verify(mService.mHandler).sendEmptyMessageAtTime(

                    eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG), followUpTimeCaptor.capture());
@@ -1109,8 +1105,6 @@ public class MockingOomAdjusterTests { 
        assertProcStates(app, PROCESS_STATE_LAST_ACTIVITY, PREVIOUS_APP_ADJ,

                SCHED_GROUP_BACKGROUND, "previous");



        if (!Flags.followUpOomadjUpdates()) return;



        final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

        verify(mService.mHandler).sendEmptyMessageAtTime(eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG),

                followUpTimeCaptor.capture());
@@ -1166,8 +1160,6 @@ public class MockingOomAdjusterTests { 
                    SCHED_GROUP_BACKGROUND, "previous");

        }



        if (!Flags.followUpOomadjUpdates()) return;



        for (int i = 0; i < numberOfApps; i++) {

            final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

            verify(mService.mHandler).sendEmptyMessageAtTime(eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG),
@@ -1969,8 +1961,6 @@ public class MockingOomAdjusterTests { 
        assertProcStates(app, PROCESS_STATE_LAST_ACTIVITY, PREVIOUS_APP_ADJ,

                SCHED_GROUP_BACKGROUND, "recent-provider");



        if (!Flags.followUpOomadjUpdates()) return;



        final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

        verify(mService.mHandler).sendEmptyMessageAtTime(eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG),

                followUpTimeCaptor.capture());
@@ -3464,8 +3454,6 @@ public class MockingOomAdjusterTests { 
        assertProcStates(app, PROCESS_STATE_SERVICE, SERVICE_ADJ, SCHED_GROUP_BACKGROUND,

                "started-services");



        if (!Flags.followUpOomadjUpdates()) return;



        final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

        verify(mService.mHandler).sendEmptyMessageAtTime(

                eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG), followUpTimeCaptor.capture());
@@ -3608,8 +3596,6 @@ public class MockingOomAdjusterTests { 
        assertProcStates(app2, PROCESS_STATE_LAST_ACTIVITY, PREVIOUS_APP_ADJ,

                SCHED_GROUP_BACKGROUND, "recent-provider");



        if (!Flags.followUpOomadjUpdates()) return;



        final ArgumentCaptor<Long> followUpTimeCaptor = ArgumentCaptor.forClass(Long.class);

        verify(mService.mHandler, atLeastOnce()).sendEmptyMessageAtTime(

                eq(FOLLOW_UP_OOMADJUSTER_UPDATE_MSG), followUpTimeCaptor.capture());