From b13b9ad62312b91c74d5df9bdbecdcad1fbcfaa1 Mon Sep 17 00:00:00 2001 From: Piotr Wilczyński Date: Fri, 23 Sep 2022 15:08:42 +0000 Subject: Fix the condition for HDR brightness Bug: 240248477 Test: Flash the CL, make sure it doesn't break anything Change-Id: I49e3adda3cfd4b793f0eeb3b1da544c581d8c8ec --- .../java/com/android/server/display/DisplayPowerController.java | 6 +++--- .../java/com/android/server/display/DisplayPowerController2.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 61225d7dee80..8d3e040bf4e6 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -1598,9 +1598,9 @@ 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.getModifier() & BrightnessReason.MODIFIER_DIMMED) == 0 - || (mBrightnessReason.getModifier() & BrightnessReason.MODIFIER_LOW_POWER) - == 0)) { + && (mBrightnessReason.getModifier() & BrightnessReason.MODIFIER_DIMMED) == 0 + && (mBrightnessReason.getModifier() & BrightnessReason.MODIFIER_LOW_POWER) + == 0) { // We want to scale HDR brightness level with the SDR level animateValue = mHbmController.getHdrBrightnessValue(); } diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index dc7db10123db..c734095a4743 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -1598,9 +1598,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal // 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.getModifier() & BrightnessReason.MODIFIER_DIMMED) == 0 - || (mBrightnessReason.getModifier() & BrightnessReason.MODIFIER_LOW_POWER) - == 0)) { + && (mBrightnessReason.getModifier() & BrightnessReason.MODIFIER_DIMMED) == 0 + && (mBrightnessReason.getModifier() & BrightnessReason.MODIFIER_LOW_POWER) + == 0) { // We want to scale HDR brightness level with the SDR level animateValue = mHbmController.getHdrBrightnessValue(); } -- cgit v1.2.3-59-g8ed1b