commit d429710f8edf6aeacb79c2f8ae8a6dc404173c42
author Michael Wright <michaelwr@google.com> Fri Feb 21 02:09:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 21 02:09:49 2014 +0000
tree f3a48407b4dd8ceaae5178b0f7a29ddd3fc24b3e
parent ac8bdfe4f06367e06e43d8759b6009b483a5e668
parent 5c977ea1b78046e54f9975c78290316fcc2d630a

Merge "Unbreak manual brightness setting."

services/core/java/com/android/server/power/DisplayPowerController.java

diff --git a/services/core/java/com/android/server/power/DisplayPowerController.java b/services/core/java/com/android/server/power/DisplayPowerController.java
index 94f26dd..12d51aa 100644
--- a/services/core/java/com/android/server/power/DisplayPowerController.java
+++ b/services/core/java/com/android/server/power/DisplayPowerController.java
@@ -510,7 +510,7 @@
             boolean slow;
             int screenAutoBrightness = mAutomaticBrightnessController != null ?
                     mAutomaticBrightnessController.getAutomaticScreenBrightness() : -1;
-            if (screenAutoBrightness >= 0) {
+            if (screenAutoBrightness >= 0 && mPowerRequest.useAutoBrightness) {
                 // Use current auto-brightness value.
                 target = screenAutoBrightness;
                 slow = mUsingScreenAutoBrightness;