Merge "Fix initial brightness state after startup." into jb-dev (a13b4da6) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -2242,8 +2242,10 @@ public class PowerManagerService extends IPowerManager.Stub
		} else {
		newValue = endValue;
		mHighestLightSensorValue = endSensorValue;
		if (endValue > 0) {
		mInitialAnimation = false;
		}
		}

		if (mDebugLightAnimation) {
		Slog.v(TAG, "Animating light: " + "start:" + startValue
		@@ -2290,7 +2292,7 @@ public class PowerManagerService extends IPowerManager.Stub
		currentMask = mask;
		duration = (int) (mWindowScaleAnimation * animationDuration);
		startTimeMillis = SystemClock.elapsedRealtime();
		mInitialAnimation = currentValue == 0 && target > 0;
		mInitialAnimation = mInitialAnimation && target > 0;

		if (mDebugLightAnimation) {
		Slog.v(TAG, "animateTo(target=" + target
		@@ -2608,7 +2610,8 @@ public class PowerManagerService extends IPowerManager.Stub
		}
		};

		private boolean mInitialAnimation; // used to prevent lightsensor changes while turning on
		/** used to prevent lightsensor changes while turning on. */
		private boolean mInitialAnimation = true;

		private void dockStateChanged(int state) {
		synchronized (mLocks) {