Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode."

This commit is contained in:
Treehugger Robot
2023-04-19 14:20:43 +00:00
committed by Gerrit Code Review

View File

@@ -1670,9 +1670,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// TODO(b/216365040): The decision to prevent HBM for HDR in low power mode should be
// done in HighBrightnessModeController.
if (mHbmController.getHighBrightnessMode() == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR
&& (mBrightnessReason.modifier & BrightnessReason.MODIFIER_DIMMED) == 0
&& (mBrightnessReason.modifier & BrightnessReason.MODIFIER_LOW_POWER) == 0) {
// We want to scale HDR brightness level with the SDR level
&& (mBrightnessReasonTemp.modifier & BrightnessReason.MODIFIER_DIMMED) == 0
&& (mBrightnessReasonTemp.modifier & BrightnessReason.MODIFIER_LOW_POWER)
== 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();
}