commit d5d4f60c835e5e92e7b766e946c330d1c006847d
author Michael Wright <michaelwr@google.com> Fri Jan 26 00:16:41 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jan 27 00:04:13 2018 +0000
tree eac875a2cb16af0c8d140cab9ef41c69d388d6ec
parent 8aab42761b3ed7c42d268949d6a9999c4edd2571

Use correct brightness when manual brightness is enabled.

We want to use whatever the current brightness setting value is, not
whatever the user set last. This means that we'll have a reasonable
value at first boot and we won't get weird brightness jumps when users
disable autobrightness.

Fixes: 72508527
Test: Manual

Change-Id: I4178593f91b231ebcffb6e2104c515e557d975fc
(cherry picked from commit 7bb223428d979ba7882c7e177af2933faaffda45)

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 b82e7c6..c5bf6d8 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -839,11 +839,8 @@
         }
 
         // Apply manual brightness.
-        // Use the current brightness setting from the request, which is expected
-        // provide a nominal default value for the case where auto-brightness
-        // is not ready yet.
         if (brightness < 0) {
-            brightness = clampScreenBrightness(mLastUserSetScreenBrightness);
+            brightness = clampScreenBrightness(mCurrentScreenBrightnessSetting);
         }