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

Commit 2029a252 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Remove idle screen refresh rate timeout flag 

Bug: 407931776
Test: Builds successfully
Flag: EXEMPT flag deletion
Change-Id: I2069f0e1c1eff24a278a7211cc4e8940e7f7dd75
parent 97faf816

services/core/java/com/android/server/display/DisplayDeviceConfig.java

+1 −2
Original line number Diff line number Diff line
@@ -2873,8 +2873,7 @@ public class DisplayDeviceConfig { 
    }



    private void loadIdleScreenRefreshRateTimeoutConfigs(@Nullable DisplayConfiguration config) {

        if (mFlags.isIdleScreenRefreshRateTimeoutEnabled()

                && config != null && config.getIdleScreenRefreshRateTimeout() != null) {

        if (config != null && config.getIdleScreenRefreshRateTimeout() != null) {

            validateIdleScreenRefreshRateTimeoutConfig(

                    config.getIdleScreenRefreshRateTimeout());

            mIdleScreenRefreshRateTimeoutLuxThresholds = config

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+0 −10
Original line number Diff line number Diff line
@@ -137,11 +137,6 @@ public class DisplayManagerFlags { 
            Flags::sensorBasedBrightnessThrottling

    );



    private final FlagState mIdleScreenRefreshRateTimeout = new FlagState(

            Flags.FLAG_IDLE_SCREEN_REFRESH_RATE_TIMEOUT,

            Flags::idleScreenRefreshRateTimeout

    );



    private final FlagState mRefactorDisplayPowerController = new FlagState(

            Flags.FLAG_REFACTOR_DISPLAY_POWER_CONTROLLER,

            Flags::refactorDisplayPowerController
@@ -425,10 +420,6 @@ public class DisplayManagerFlags { 
        return mSensorBasedBrightnessThrottling.isEnabled();

    }



    public boolean isIdleScreenRefreshRateTimeoutEnabled() {

        return mIdleScreenRefreshRateTimeout.isEnabled();

    }



    public boolean isRefactorDisplayPowerControllerEnabled() {

        return mRefactorDisplayPowerController.isEnabled();

    }
@@ -654,7 +645,6 @@ public class DisplayManagerFlags { 
        pw.println(" " + mAlwaysRotateDisplayDevice);

        pw.println(" " + mPixelAnisotropyCorrectionEnabled);

        pw.println(" " + mSensorBasedBrightnessThrottling);

        pw.println(" " + mIdleScreenRefreshRateTimeout);

        pw.println(" " + mRefactorDisplayPowerController);

        pw.println(" " + mResolutionBackupRestore);

        pw.println(" " + mUseFusionProxSensor);

services/core/java/com/android/server/display/feature/display_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -214,14 +214,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "idle_screen_refresh_rate_timeout"

    namespace: "display_manager"

    description: "Feature flag for reducing the refresh rate when the screen is idle after a timeout"

    bug: "310026579"

    is_fixed_read_only: true

}



flag {

    name: "use_fusion_prox_sensor"

    namespace: "display_manager"

services/core/java/com/android/server/display/mode/DisplayModeDirector.java

+1 −3
Original line number Diff line number Diff line
@@ -2687,10 +2687,8 @@ public class DisplayModeDirector { 
                    // is interrupted by a new sensor event.

                    mHandler.postDelayed(mInjectSensorEventRunnable, INJECT_EVENTS_INTERVAL_MS);

                }

                if (mDisplayManagerFlags.isIdleScreenRefreshRateTimeoutEnabled()) {

                updateIdleScreenRefreshRate(mAmbientLux);

            }

            }



            @Override

            public void onAccuracyChanged(Sensor sensor, int accuracy) {

services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public final class DisplayDeviceConfigTest { 
        when(mContext.getResources()).thenReturn(mResources);

        when(mFlags.areAutoBrightnessModesEnabled()).thenReturn(true);

        when(mFlags.isSensorBasedBrightnessThrottlingEnabled()).thenReturn(true);

        when(mFlags.isIdleScreenRefreshRateTimeoutEnabled()).thenReturn(true);

        mockDeviceConfigs();

    }