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

Commit 1fdf3817 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 am:... 

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

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



Change-Id: I7464dc47a46de7dfd529dfad969e24c49d54c103
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea20fb86 0e3df7be

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

            }