From 5c977ea1b78046e54f9975c78290316fcc2d630a Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Tue, 18 Feb 2014 22:50:50 -0800
Subject: [PATCH] Unbreak manual brightness setting.

Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
---
 .../java/com/android/server/power/DisplayPowerController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/power/DisplayPowerController.java b/services/core/java/com/android/server/power/DisplayPowerController.java
index 291bb64728a79..38d99ef8441d1 100644
--- a/services/core/java/com/android/server/power/DisplayPowerController.java
+++ b/services/core/java/com/android/server/power/DisplayPowerController.java
@@ -503,7 +503,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
             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;