diff options
| author | 2023-02-21 13:31:50 +0000 | |
|---|---|---|
| committer | 2023-02-21 13:31:50 +0000 | |
| commit | 186c5ff1a6be65a30d8b0b71b8fd5dd67e6d7c9b (patch) | |
| tree | 845791d215270a9af47bf6237d8b6d927351eb75 | |
| parent | 2d24b0fa6a30c9ab3dd39a12f081dc812fb61627 (diff) | |
| parent | ce7c4bef3d7472070566a301b2bdfa1f0cef658e (diff) | |
Merge "Don't register the binned brightness sensor for disabled displays" into tm-qpr-dev am: ce7c4bef3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21288373
Change-Id: Ia4ca7bad357fb44dea65edbc0eee26798665d980
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index f8065bb9b1e9..c2bd83ab50b4 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -1317,7 +1317,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (mScreenOffBrightnessSensorController != null) { mScreenOffBrightnessSensorController.setLightSensorEnabled(mUseAutoBrightness - && (state == Display.STATE_OFF || (state == Display.STATE_DOZE + && mIsEnabled && (state == Display.STATE_OFF || (state == Display.STATE_DOZE && !mAllowAutoBrightnessWhileDozingConfig))); } |