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

Commit b1d6b307 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155320



Change-Id: I225711f6d43db19cddedb7e4954739707c973b3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71ff01c2 f7a5b2d8

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

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

            }