Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b13b9ad6 authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

Fix the condition for HDR brightness 

Bug: 240248477
Test: Flash the CL, make sure it doesn't break anything
Change-Id: I49e3adda3cfd4b793f0eeb3b1da544c581d8c8ec
parent 9be01f68

services/core/java/com/android/server/display/DisplayPowerController.java

+3 −3
Original line number Diff line number Diff line
@@ -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();

            }

services/core/java/com/android/server/display/DisplayPowerController2.java

+3 −3
Original line number Diff line number Diff line
@@ -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();

            }