Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix brightness transition from temporary to automatic brightness" into udc-dev

Browse Source
This commit is contained in:
Rupesh Bansal
2023-04-04 09:30:09 +00:00
committed by Android (Google) Code Review
parent 50e3d920d0 f426112709
commit 749861bc50
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/display/DisplayPowerController2.java
View File

@@ -1206,14 +1206,15 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
// actual state instead of the desired one. // actual state instead of the desired one.
animateScreenStateChange(state, mDisplayStateController.shouldPerformScreenOffTransition()); animateScreenStateChange(state, mDisplayStateController.shouldPerformScreenOffTransition());
state = mPowerState.getScreenState(); state = mPowerState.getScreenState();
final boolean userSetBrightnessChanged = mDisplayBrightnessController
.updateUserSetScreenBrightness();
DisplayBrightnessState displayBrightnessState = mDisplayBrightnessController DisplayBrightnessState displayBrightnessState = mDisplayBrightnessController
.updateBrightness(mPowerRequest, state); .updateBrightness(mPowerRequest, state);
float brightnessState = displayBrightnessState.getBrightness(); float brightnessState = displayBrightnessState.getBrightness();
float rawBrightnessState = displayBrightnessState.getBrightness(); float rawBrightnessState = displayBrightnessState.getBrightness();
mBrightnessReasonTemp.set(displayBrightnessState.getBrightnessReason()); mBrightnessReasonTemp.set(displayBrightnessState.getBrightnessReason());
final boolean userSetBrightnessChanged = mDisplayBrightnessController
.updateUserSetScreenBrightness();
// Take note if the short term model was already active before applying the current // Take note if the short term model was already active before applying the current
// request changes. // request changes.
final boolean wasShortTermModelActive = final boolean wasShortTermModelActive =