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

Merge "Fix slider being at 0 on unlock" into sc-dev

Browse Source
This commit is contained in:
Fiona Campbell
2021-06-14 13:57:31 +00:00
committed by Android (Google) Code Review
parent 938e8adc41 4384409dae
commit 10a6b054ff
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -941,6 +941,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
final boolean mustNotify; final boolean mustNotify;
final int previousPolicy; final int previousPolicy;
boolean mustInitialize = false; boolean mustInitialize = false;
boolean shouldSaveBrightnessInfo = true;
int brightnessAdjustmentFlags = 0; int brightnessAdjustmentFlags = 0;
mBrightnessReasonTemp.set(null); mBrightnessReasonTemp.set(null);
synchronized (mLock) { synchronized (mLock) {
@@ -1071,6 +1072,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (state == Display.STATE_OFF) { if (state == Display.STATE_OFF) {
brightnessState = PowerManager.BRIGHTNESS_OFF_FLOAT; brightnessState = PowerManager.BRIGHTNESS_OFF_FLOAT;
mBrightnessReasonTemp.setReason(BrightnessReason.REASON_SCREEN_OFF); mBrightnessReasonTemp.setReason(BrightnessReason.REASON_SCREEN_OFF);
shouldSaveBrightnessInfo = false;
} }
// Always use the VR brightness when in the VR state. // Always use the VR brightness when in the VR state.
@@ -1197,6 +1199,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
&& Display.isDozeState(state)) { && Display.isDozeState(state)) {
brightnessState = mScreenBrightnessDozeConfig; brightnessState = mScreenBrightnessDozeConfig;
mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE_DEFAULT); mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE_DEFAULT);
shouldSaveBrightnessInfo = false;
} }
// Apply manual brightness. // Apply manual brightness.
@@ -1213,8 +1216,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Save out the brightness info now that the brightness state for this iteration has been // Save out the brightness info now that the brightness state for this iteration has been
// finalized and before we send out notifications about the brightness changing. // finalized and before we send out notifications about the brightness changing.
if (shouldSaveBrightnessInfo) {
saveBrightnessInfo(brightnessState); saveBrightnessInfo(brightnessState);
}
if (updateScreenBrightnessSetting) { if (updateScreenBrightnessSetting) {
// Tell the rest of the system about the new brightness in case we had to change it // Tell the rest of the system about the new brightness in case we had to change it
// for things like auto-brightness or high-brightness-mode. Note that we do this // for things like auto-brightness or high-brightness-mode. Note that we do this