commit 0085ce0513ddfb05e05ad1012f30b96b69fbb830
author Julius D'souza <jdsouza@google.com> Fri Oct 21 22:36:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 21 22:36:58 2016 +0000
tree 963c67fef5790e2b6458d465fa35b56d65454c3b
parent 2979f63cd9ad59240b9cd6082edb4d4b3a09d98b
parent 637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a

DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
am: 637ae798cc

Change-Id: I3c2045d253a75d9afcf8771a503188c47d8de49d

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 d2e29cd..6c28cf0 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -686,8 +686,10 @@
         }
 
         // Apply dimming by at least some minimum amount when user activity
-        // timeout is about to expire.
-        if (mPowerRequest.policy == DisplayPowerRequest.POLICY_DIM) {
+        // timeout is about to expire unless we're having an ALS-based doze brightness
+        // in which case the brightness could increase, causing unwanted flashes.
+        if (mPowerRequest.policy == DisplayPowerRequest.POLICY_DIM
+                && !mAllowAutoBrightnessWhileDozingConfig) {
             if (brightness > mScreenBrightnessRangeMinimum) {
                 brightness = Math.max(Math.min(brightness - SCREEN_DIM_MINIMUM_REDUCTION,
                         mScreenBrightnessDimConfig), mScreenBrightnessRangeMinimum);