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

Commit a053e98a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the condition for HDR brightness"

parents 9d283e14 b13b9ad6

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();

            }