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

Commit 82165618 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Clean up automaticbrightnesscontroller"

parents 70ba2506 b244c5ef

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -220,13 +220,13 @@ class AutomaticBrightnessController { 
            float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate,

            float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate,

            long brighteningLightDebounceConfig, long darkeningLightDebounceConfig,

            long brighteningLightDebounceConfig, long darkeningLightDebounceConfig,

            boolean resetAmbientLuxAfterWarmUpConfig, HysteresisLevels ambientBrightnessThresholds,

            boolean resetAmbientLuxAfterWarmUpConfig, HysteresisLevels ambientBrightnessThresholds,

            HysteresisLevels screenBrightnessThresholds, LogicalDisplay display, Context context,

            HysteresisLevels screenBrightnessThresholds, Context context,

            HighBrightnessModeController hbmController) {

            HighBrightnessModeController hbmController) {

        this(new Injector(), callbacks, looper, sensorManager, lightSensor, mapper,

        this(new Injector(), callbacks, looper, sensorManager, lightSensor, mapper,

                lightSensorWarmUpTime, brightnessMin, brightnessMax, dozeScaleFactor,

                lightSensorWarmUpTime, brightnessMin, brightnessMax, dozeScaleFactor,

                lightSensorRate, initialLightSensorRate, brighteningLightDebounceConfig,

                lightSensorRate, initialLightSensorRate, brighteningLightDebounceConfig,

                darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig,

                darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig,

                ambientBrightnessThresholds, screenBrightnessThresholds, display, context,

                ambientBrightnessThresholds, screenBrightnessThresholds, context,

                hbmController

                hbmController

        );

        );

    }

    }
@@ -238,7 +238,7 @@ class AutomaticBrightnessController { 
            float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate,

            float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate,

            long brighteningLightDebounceConfig, long darkeningLightDebounceConfig,

            long brighteningLightDebounceConfig, long darkeningLightDebounceConfig,

            boolean resetAmbientLuxAfterWarmUpConfig, HysteresisLevels ambientBrightnessThresholds,

            boolean resetAmbientLuxAfterWarmUpConfig, HysteresisLevels ambientBrightnessThresholds,

            HysteresisLevels screenBrightnessThresholds, LogicalDisplay display, Context context,

            HysteresisLevels screenBrightnessThresholds, Context context,

            HighBrightnessModeController hbmController) {

            HighBrightnessModeController hbmController) {

        mInjector = injector;

        mInjector = injector;

        mContext = context;

        mContext = context;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -925,7 +925,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    PowerManager.BRIGHTNESS_MAX, dozeScaleFactor, lightSensorRate,

                    PowerManager.BRIGHTNESS_MAX, dozeScaleFactor, lightSensorRate,

                    initialLightSensorRate, brighteningLightDebounce, darkeningLightDebounce,

                    initialLightSensorRate, brighteningLightDebounce, darkeningLightDebounce,

                    autoBrightnessResetAmbientLuxAfterWarmUp, ambientBrightnessThresholds,

                    autoBrightnessResetAmbientLuxAfterWarmUp, ambientBrightnessThresholds,

                    screenBrightnessThresholds, mLogicalDisplay, mContext, mHbmController);

                    screenBrightnessThresholds, mContext, mHbmController);

        } else {

        } else {

            mUseSoftwareAutoBrightnessConfig = false;

            mUseSoftwareAutoBrightnessConfig = false;

        }

        }

services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -56,12 +56,9 @@ public class AutomaticBrightnessControllerTest { 
    private static final int DARKENING_LIGHT_DEBOUNCE_CONFIG = 0;

    private static final int DARKENING_LIGHT_DEBOUNCE_CONFIG = 0;

    private static final float DOZE_SCALE_FACTOR = 0.0f;

    private static final float DOZE_SCALE_FACTOR = 0.0f;

    private static final boolean RESET_AMBIENT_LUX_AFTER_WARMUP_CONFIG = false;

    private static final boolean RESET_AMBIENT_LUX_AFTER_WARMUP_CONFIG = false;

    private static final int DISPLAY_ID = 0;

    private static final int LAYER_STACK = 0;

    private static final int LIGHT_SENSOR_WARMUP_TIME = 0;

    private static final int LIGHT_SENSOR_WARMUP_TIME = 0;





    private Context mContext;

    private Context mContext;

    private LogicalDisplay mLogicalDisplay;

    private AutomaticBrightnessController mController;

    private AutomaticBrightnessController mController;





    @Mock SensorManager mSensorManager;

    @Mock SensorManager mSensorManager;
@@ -69,7 +66,6 @@ public class AutomaticBrightnessControllerTest { 
    @Mock HysteresisLevels mAmbientBrightnessThresholds;

    @Mock HysteresisLevels mAmbientBrightnessThresholds;

    @Mock HysteresisLevels mScreenBrightnessThresholds;

    @Mock HysteresisLevels mScreenBrightnessThresholds;

    @Mock Handler mNoOpHandler;

    @Mock Handler mNoOpHandler;

    @Mock DisplayDevice mDisplayDevice;

    @Mock HighBrightnessModeController mHbmController;

    @Mock HighBrightnessModeController mHbmController;





    @Before

    @Before
@@ -79,7 +75,6 @@ public class AutomaticBrightnessControllerTest { 
        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);





        mContext = InstrumentationRegistry.getContext();

        mContext = InstrumentationRegistry.getContext();

        mLogicalDisplay = new LogicalDisplay(DISPLAY_ID, LAYER_STACK, mDisplayDevice);

    }

    }





    @After

    @After
@@ -104,7 +99,7 @@ public class AutomaticBrightnessControllerTest { 
                BRIGHTNESS_MAX_FLOAT, DOZE_SCALE_FACTOR, LIGHT_SENSOR_RATE,

                BRIGHTNESS_MAX_FLOAT, DOZE_SCALE_FACTOR, LIGHT_SENSOR_RATE,

                INITIAL_LIGHT_SENSOR_RATE, BRIGHTENING_LIGHT_DEBOUNCE_CONFIG,

                INITIAL_LIGHT_SENSOR_RATE, BRIGHTENING_LIGHT_DEBOUNCE_CONFIG,

                DARKENING_LIGHT_DEBOUNCE_CONFIG, RESET_AMBIENT_LUX_AFTER_WARMUP_CONFIG,

                DARKENING_LIGHT_DEBOUNCE_CONFIG, RESET_AMBIENT_LUX_AFTER_WARMUP_CONFIG,

                mAmbientBrightnessThresholds, mScreenBrightnessThresholds, mLogicalDisplay,

                mAmbientBrightnessThresholds, mScreenBrightnessThresholds,

                mContext, mHbmController

                mContext, mHbmController

        );

        );