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

Commit 924fd9ad authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Android (Google) Code Review
Browse files

Merge "Don't save default doze brightness" into main

parents 997a11f0 8d1d95cd

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

+1 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                // use the current brightness setting scaled by the doze scale factor

                rawBrightnessState = getDozeBrightnessForOffload();

                brightnessState = clampScreenBrightness(rawBrightnessState);

                updateScreenBrightnessSetting = false;

                mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE_MANUAL);

                mTempBrightnessEvent.setFlags(

                        mTempBrightnessEvent.getFlags() | BrightnessEvent.FLAG_DOZE_SCALE);
@@ -1513,6 +1512,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                brightnessState = clampScreenBrightness(rawBrightnessState);

                mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE_DEFAULT);

            }

            updateScreenBrightnessSetting = false;

        }



        if (!mFlags.isRefactorDisplayPowerControllerEnabled()) {

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

+2 −0
Original line number Diff line number Diff line
@@ -2224,6 +2224,8 @@ public final class DisplayPowerControllerTest { 
        verify(mHolder.animator).animateTo(eq(DEFAULT_DOZE_BRIGHTNESS),

                /* linearSecondTarget= */ anyFloat(), eq(BRIGHTNESS_RAMP_RATE_FAST_INCREASE),

                eq(false));

        // This brightness shouldn't be stored in the setting

        verify(mHolder.brightnessSetting, never()).setBrightness(DEFAULT_DOZE_BRIGHTNESS);



        // The display device changes and the default doze brightness changes

        setUpDisplay(DISPLAY_ID, "new_unique_id", mHolder.display, mock(DisplayDevice.class),