| commit | 186c5ff1a6be65a30d8b0b71b8fd5dd67e6d7c9b | [log] [tgz] |
|---|---|---|
| author | Piotr Wilczyński <wilczynskip@google.com> | Tue Feb 21 13:31:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 21 13:31:50 2023 +0000 |
| 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>
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index f8065bb..c2bd83a 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 @@ if (mScreenOffBrightnessSensorController != null) { mScreenOffBrightnessSensorController.setLightSensorEnabled(mUseAutoBrightness - && (state == Display.STATE_OFF || (state == Display.STATE_DOZE + && mIsEnabled && (state == Display.STATE_OFF || (state == Display.STATE_DOZE && !mAllowAutoBrightnessWhileDozingConfig))); }