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

Merge "Use config.xml as brightness default fallback." into sc-dev am: 2188e52237

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

Change-Id: Ic66c576faea1d79cd2f2468e67ee4a83478c42d1
This commit is contained in:
Fiona Campbell
2021-05-14 15:49:07 +00:00
committed by Automerger Merge Worker
parent ca34dc2e15 2188e52237
commit 9033e157c7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/display/DisplayDeviceConfig.java
View File

@@ -422,7 +422,7 @@ public class DisplayDeviceConfig {
if (configBrightnessDefault != null) {
mBrightnessDefault = configBrightnessDefault.floatValue();
} else {
mBrightnessDefault = BRIGHTNESS_DEFAULT;
loadBrightnessDefaultFromConfigXml();
}
}
}

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

@@ -1362,6 +1362,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+ mBrightnessReasonTemp.toString(brightnessAdjustmentFlags)
+ "', previous reason: '" + mBrightnessReason + "'.");
mBrightnessReason.set(mBrightnessReasonTemp);
} else if (mBrightnessReasonTemp.reason == BrightnessReason.REASON_MANUAL
&& userSetBrightnessChanged) {
Slog.v(TAG, "Brightness [" + brightnessState + "] manual adjustment.");
}
// Update display white-balance.
@@ -2021,7 +2024,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
|| mPendingScreenBrightnessSetting < 0.0f)) {
return false;
}
if (mCurrentScreenBrightnessSetting == mPendingScreenBrightnessSetting) {
if (BrightnessSynchronizer.floatEquals(
mCurrentScreenBrightnessSetting, mPendingScreenBrightnessSetting)) {
mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;
mTemporaryScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;
return false;