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

Commit f4261127 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Fix brightness transition from temporary to automatic brightness 

Because the strategy evaluation is now happening before deciding if the
brightness is user set or not, we can end up in a state where the
temporary brightness strategy would win over automatic.

Bug: 276702594
Test: Manually verified the transitions are as expected
Change-Id: Ie8191312f9c5684832254de52657e04d5c8f1148
parent 33a31302

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

+3 −2
Original line number Diff line number Diff line
@@ -1206,14 +1206,15 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        // actual state instead of the desired one.

        animateScreenStateChange(state, mDisplayStateController.shouldPerformScreenOffTransition());

        state = mPowerState.getScreenState();

        final boolean userSetBrightnessChanged = mDisplayBrightnessController

                .updateUserSetScreenBrightness();



        DisplayBrightnessState displayBrightnessState = mDisplayBrightnessController

                .updateBrightness(mPowerRequest, state);

        float brightnessState = displayBrightnessState.getBrightness();

        float rawBrightnessState = displayBrightnessState.getBrightness();

        mBrightnessReasonTemp.set(displayBrightnessState.getBrightnessReason());

        final boolean userSetBrightnessChanged = mDisplayBrightnessController

                .updateUserSetScreenBrightness();



        // Take note if the short term model was already active before applying the current

        // request changes.

        final boolean wasShortTermModelActive =