Merge "Do not brighten when dim state or low power mode."

This commit is contained in:
Piotr Wilczyński
2022-10-04 12:16:54 +00:00
committed by Gerrit Code Review

View File

@@ -1551,8 +1551,8 @@ 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)) {
&& (mBrightnessReason.modifier & BrightnessReason.MODIFIER_DIMMED) == 0
&& (mBrightnessReason.modifier & BrightnessReason.MODIFIER_LOW_POWER) == 0) {
// We want to scale HDR brightness level with the SDR level
animateValue = mHbmController.getHdrBrightnessValue();
}