Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode." am: 13df77c341
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299688
Change-Id: If044abd54cb02d0ae711a10dbf8e3eb58d35f8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 54189bf7..237485b 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1670,9 +1670,11 @@
// 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) {
- // We want to scale HDR brightness level with the SDR level
+ && (mBrightnessReasonTemp.modifier & BrightnessReason.MODIFIER_DIMMED) == 0
+ && (mBrightnessReasonTemp.modifier & BrightnessReason.MODIFIER_LOW_POWER)
+ == 0) {
+ // We want to scale HDR brightness level with the SDR level, we also need to restore
+ // SDR brightness immediately when entering dim or low power mode.
animateValue = mHbmController.getHdrBrightnessValue();
}