From b76e9beaf30e88afdcf079544a33a59c19642224 Mon Sep 17 00:00:00 2001 From: linkai Date: Tue, 6 Sep 2022 18:56:45 +0800 Subject: [PATCH] Do not brighten when dim state or low power mode. Bug:239122393 Signed-off-by: linkai Change-Id: Ia8e636a5f22f1854830c312658857253729c076b Merged-In: I49e3adda3cfd4b793f0eeb3b1da544c581d8c8ec --- .../com/android/server/display/DisplayPowerController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 6a57e4070f657..070acd0b61835 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -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(); }