1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
index 65e971cf370d..66b5e3772974 100644
--- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
@@ -275,9 +275,9 @@ class AutomaticBrightnessController {
         boolean enableSensor = enable && !dozing;
         if (enableSensor && !mLightSensorEnabled && mActiveDozeLightSensor) {
             mActiveDozeLightSensor = false;
-        } else if (!enableSensor && mLightSensorEnabled) {
+        } else if (!enableSensor && mLightSensorEnabled && mLuxLevels.hasDynamicDozeBrightness()) {
             // keep the light sensor active until another light sample is taken while dozing
-            mActiveDozeLightSensor = mLuxLevels.hasDynamicDozeBrightness();
+            mActiveDozeLightSensor = true;
             adjustLightSensorRate(mInitialLightSensorRate);
             if (mUseNewSensorSamplesForDoze) {
                 mAmbientLightRingBuffer.clear();