Merge "Don't reset brightness to 0 on initial boot." into jb-dev

Author: Jeff Brown

services/java/com/android/server/PowerManagerService.java

@@ -1746,14 +1746,16 @@ private int setScreenStateLocked(boolean on) {
             Slog.i(TAG, "Set screen state: " + on, e);
         }
         if (on) {
-            if ((mPowerState & SCREEN_ON_BIT) == 0 || mSkippedScreenOn) {
+            if (mInitialized && ((mPowerState & SCREEN_ON_BIT) == 0 || mSkippedScreenOn)) {
                 // If we are turning the screen state on, but the screen
                 // light is currently off, then make sure that we set the
                 // light at this point to 0.  This is the case where we are
                 // turning on the screen and waiting for the UI to be drawn
                 // before showing it to the user.  We want the light off
                 // until it is ready to be shown to the user, not it using
                 // whatever the last value it had.
+                // Skip this if the screen is being turned on for the first time
+                // after boot (mInitialized is false).
                 if (DEBUG_SCREEN_ON) {
                     Slog.i(TAG, "Forcing brightness 0: mPowerState=0x"
                             + Integer.toHexString(mPowerState)
@@ -2325,14 +2327,20 @@ public void animateTo(int target, int sensorTarget, int mask, int animationDurat
                     // current animation is unrelated to new animation, jump to final values
                     cancelAnimation();
                 }
+                if (mInitialAnimation) {
+                    // jump to final value in one step the first time the brightness is set
+                    animationDuration = 0;
+                    if (target > 0) {
+                        mInitialAnimation = false;
+                    }
+                }
                 startValue = currentValue;
                 endValue = target;
                 startSensorValue = mHighestLightSensorValue;
                 endSensorValue = sensorTarget;
                 currentMask = mask;
                 duration = (int) (mWindowScaleAnimation * animationDuration);
                 startTimeMillis = SystemClock.elapsedRealtime();
-                mInitialAnimation = mInitialAnimation && target > 0;
 
                 if (mDebugLightAnimation) {
                     Slog.v(TAG, "animateTo(target=" + target