From 789954fb699430a414b4449be71e662cb7cb5d84 Mon Sep 17 00:00:00 2001
From: Julius D'souza <jdsouza@google.com>
Date: Tue, 27 Jun 2017 06:48:51 -0700
Subject: [PATCH] DO NOT MERGE: Add dynamic doze check for the active doze
 light sensor.

Bug: 62038345
Change-Id: I4b86a1b9ab56f560e863663b9f89195ae1187ab4
---
 .../android/server/display/AutomaticBrightnessController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
index 31e8ae2cb39d8..65e971cf370d7 100644
--- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
@@ -277,7 +277,7 @@ class AutomaticBrightnessController {
             mActiveDozeLightSensor = false;
         } else if (!enableSensor && mLightSensorEnabled) {
             // keep the light sensor active until another light sample is taken while dozing
-            mActiveDozeLightSensor = true;
+            mActiveDozeLightSensor = mLuxLevels.hasDynamicDozeBrightness();
             adjustLightSensorRate(mInitialLightSensorRate);
             if (mUseNewSensorSamplesForDoze) {
                 mAmbientLightRingBuffer.clear();