diff options
| author | 2023-04-19 14:54:33 +0000 | |
|---|---|---|
| committer | 2023-04-19 14:54:33 +0000 | |
| commit | fa55b26faecf078a97479fdfb9bd17a8a392cc55 (patch) | |
| tree | 5ec0ae5899f1910edc12002dedc1c798956d718c | |
| parent | 49e631387c92b96c3c7e2d9f313dbd62cd1423c0 (diff) | |
| parent | 13df77c341a54b29aab69232791d27aefea663da (diff) | |
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>
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 54189bf7925e..237485bca1f9 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 @@ 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) { - // 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(); } |