From 637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a Mon Sep 17 00:00:00 2001
From: Julius D'souza <jdsouza@google.com>
Date: Fri, 21 Oct 2016 14:06:28 -0700
Subject: [PATCH] DO NOT MERGE: Disable dim brightness reset when using
 ALS-based doze

Bug: 32169300

Change-Id: I60d23405eb38ec0625b5b7f739a84918f4632359
---
 .../com/android/server/display/DisplayPowerController.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index dfd42543c0783..120c96cda70fa 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 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         }
 
         // 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);