Merge "Unbreak manual brightness setting."

This commit is contained in:
Michael Wright
2014-02-21 02:09:48 +00:00
committed by Android (Google) Code Review

View File

@@ -510,7 +510,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;