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

Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode." am: 13df77c341 am: fa55b26fae

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

Change-Id: I35ba9958e779bb6e519bf1bbd5a788c11cc8f3c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-19 15:35:57 +00:00
committed by Automerger Merge Worker
parent 12bcbe54db fa55b26fae
commit 34b0354955
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1703,9 +1703,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// TODO(b/216365040): The decision to prevent HBM for HDR in low power mode should be // TODO(b/216365040): The decision to prevent HBM for HDR in low power mode should be
// done in HighBrightnessModeController. // done in HighBrightnessModeController.
if (mHbmController.getHighBrightnessMode() == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR if (mHbmController.getHighBrightnessMode() == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR
&& (mBrightnessReason.modifier & BrightnessReason.MODIFIER_DIMMED) == 0 && (mBrightnessReasonTemp.modifier & BrightnessReason.MODIFIER_DIMMED) == 0
&& (mBrightnessReason.modifier & BrightnessReason.MODIFIER_LOW_POWER) == 0) { && (mBrightnessReasonTemp.modifier & BrightnessReason.MODIFIER_LOW_POWER)
// We want to scale HDR brightness level with the SDR level == 0) {
// We want to scale HDR brightness level with the SDR level, we also need to restore
// SDR brightness immediately when entering dim or low power mode.
animateValue = mHbmController.getHdrBrightnessValue(); animateValue = mHbmController.getHdrBrightnessValue();
} }