commit ce7c4bef3d7472070566a301b2bdfa1f0cef658e
author Piotr Wilczyński <wilczynskip@google.com> Tue Feb 21 13:27:12 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 13:27:12 2023 +0000
tree 37458c937e15d6ddeba532cf816874326fa64a9b
parent e58b1161c41d64afafadfada46d2e7362efd78a7
parent 3e25eee96b0319c8c8a473791a3c1d086e183928

Merge "Don't register the binned brightness sensor for disabled displays" into tm-qpr-dev

services/core/java/com/android/server/display/DisplayPowerController.java

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 7957ed6..5ecc7f2 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)));
         }