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

Commit 7fddadf6 authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Automerger Merge Worker
Browse files

Merge "Fix brightness transition from temporary to automatic brightness" into... 

Merge "Fix brightness transition from temporary to automatic brightness" into udc-dev am: 749861bc am: 5617ad48

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22425567



Change-Id: I203aad6d84fcf7a8a89f00d3d5f5d25ae718cd8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 482a46a1 5617ad48

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 =