commit 45d50a1363222ce5c3e352c6ba17f90e29bb3467
author Adrian Roos <roosa@google.com> Mon May 19 19:30:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 19 19:30:15 2014 +0000
tree cdf2b615f0932c1fe6124a30f6c0cf60480f5f69
parent b19c19265448a6252b1c14f3da85d52e50be34c3
parent 6da87ab684f104baa836138ca5153eb2d6c1f929

Merge "Speed up brightness transition if auto brightness adjustment is changed"

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 3d5fb57..bc264fa 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -421,6 +421,7 @@
         final boolean mustNotify;
         boolean mustInitialize = false;
         boolean wasDimOrDoze = false;
+        boolean autoBrightnessAdjustmentChanged = false;
 
         synchronized (mLock) {
             mPendingUpdatePowerStateLocked = false;
@@ -437,6 +438,8 @@
             } else if (mPendingRequestChangedLocked) {
                 wasDimOrDoze = (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DIM
                         || mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE);
+                autoBrightnessAdjustmentChanged = (mPowerRequest.screenAutoBrightnessAdjustment
+                        != mPendingRequestLocked.screenAutoBrightnessAdjustment);
                 mPowerRequest.copyFrom(mPendingRequestLocked);
                 mWaitingForNegativeProximity |= mPendingWaitForNegativeProximityLocked;
                 mPendingWaitForNegativeProximityLocked = false;
@@ -494,7 +497,7 @@
             if (screenAutoBrightness >= 0 && mPowerRequest.useAutoBrightness) {
                 // Use current auto-brightness value.
                 target = screenAutoBrightness;
-                slow = mUsingScreenAutoBrightness;
+                slow = mUsingScreenAutoBrightness && !autoBrightnessAdjustmentChanged;
                 mUsingScreenAutoBrightness = true;
             } else {
                 // Light sensor is disabled or not ready yet.