From 3e25eee96b0319c8c8a473791a3c1d086e183928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wilczy=C5=84ski?= <wilczynskip@google.com>
Date: Mon, 6 Feb 2023 11:45:50 +0000
Subject: [PATCH] Don't register the binned brightness sensor for disabled
 displays

Bug: 267776127
Test: Added extra logs to check what sensors were registered.
Change-Id: I3b1878c9f8fdee8cc21b4adf422afa7539cd84bd
Merged-In: I3b1878c9f8fdee8cc21b4adf422afa7539cd84bd
---
 .../java/com/android/server/display/DisplayPowerController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index b431306e294dd..a9a35f26307e2 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1306,7 +1306,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)));
         }