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

Commit 73698cce authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by Android (Google) Code Review
Browse files

Merge "Cleanup raise_bound_ui_service_threshold flag" into main

parents 87cebf6d 6f8adbd4

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

+1 −2
Original line number Diff line number Diff line
@@ -419,8 +419,7 @@ public abstract class OomAdjuster { 
    /**

     * The oom score a client needs to be to raise a service with UI out of cache.

     */

    protected static final int CACHING_UI_SERVICE_CLIENT_ADJ_THRESHOLD =

            Flags.raiseBoundUiServiceThreshold() ? SERVICE_ADJ : PERCEPTIBLE_APP_ADJ;

    protected static final int CACHING_UI_SERVICE_CLIENT_ADJ_THRESHOLD = SERVICE_ADJ;



    static final long PERCEPTIBLE_TASK_TIMEOUT_MILLIS = 5 * 60 * 1000;

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

+0 −11
Original line number Diff line number Diff line
@@ -284,17 +284,6 @@ flag { 
    }

}



flag {

    name: "raise_bound_ui_service_threshold"

    namespace: "backstage_power"

    is_fixed_read_only: true

    description: "Raise the threshold OomAdjuster will drop a service with UI to cached."

    bug: "391691057"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "lower_sms_oom_importance"

    namespace: "backstage_power"

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

+2 −10
Original line number Diff line number Diff line
@@ -3663,16 +3663,8 @@ public class MockingOomAdjusterTests { 


        setWakefulness(PowerManagerInternal.WAKEFULNESS_AWAKE);

        updateOomAdj(app, client);

        if (Flags.raiseBoundUiServiceThreshold()) {

        assertProcStates(app, PROCESS_STATE_SERVICE, SERVICE_ADJ, SCHED_GROUP_BACKGROUND,

                "service");

        } else {

            final int expectedAdj = mService.mConstants.USE_TIERED_CACHED_ADJ

                    ? sFirstUiCachedAdj : sFirstCachedAdj;

            assertProcStates(app, PROCESS_STATE_SERVICE, expectedAdj, SCHED_GROUP_BACKGROUND,

                    "cch-bound-ui-services");

            assertNoImplicitCpuTime(app);

        }

    }



    @SuppressWarnings("GuardedBy")