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

Merge "Fix manual brightness slider"

Browse Source
This commit is contained in:
Kenny Guy
2018-02-01 17:06:35 +00:00
committed by Android (Google) Code Review
parent a61111abe7 ad9a6ea830
commit 52c0747408
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,6 +479,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mScreenBrightnessForVr = getScreenBrightnessForVrSetting();
mAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();
mTemporaryScreenBrightness = -1;
mPendingScreenBrightnessSetting = -1;
mTemporaryAutoBrightnessAdjustment = Float.NaN;
}
@@ -1476,6 +1477,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mPendingScreenBrightnessSetting = -1;
return false;
}
mCurrentScreenBrightnessSetting = mPendingScreenBrightnessSetting;
mLastUserSetScreenBrightness = mPendingScreenBrightnessSetting;
mPendingScreenBrightnessSetting = -1;
return true;
@@ -1484,7 +1486,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
private void notifyBrightnessChanged(int brightness, boolean userInitiated,
boolean hadUserDataPoint) {
final float brightnessInNits = convertToNits(brightness);
if (brightnessInNits >= 0.0f && mAutomaticBrightnessController != null) {
if (mPowerRequest.useAutoBrightness && brightnessInNits >= 0.0f
&& mAutomaticBrightnessController != null) {
// We only want to track changes on devices that can actually map the display backlight
// values into a physical brightness unit since the value provided by the API is in
// nits and not using the arbitrary backlight units.