Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6df928e authored Mar 02, 2012 by Craig Mautner Committed by Android (Google) Code Review Mar 02, 2012

Merge "Fix rotation so orientation changes aren't dropped. Modify test so that...

Merge "Fix rotation so orientation changes aren't dropped. Modify test so that rotation animation is entered one final time after rotation completes. This last time causes mUpdateRotation to be set true forcing a test for orientation change. Fixes bug 6109189."

parents dc043b58 a731cd30

services/java/com/android/server/wm/ScreenRotationAnimation.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -602,6 +602,7 @@ class ScreenRotationAnimation implements WindowManagerService.StepAnimator {
		public boolean startAndFinishAnimationLocked(long now) {
		if (!isAnimating()) {
		if (DEBUG_STATE) Slog.v(TAG, "Step: no animations running");
		mFinishAnimReady = false;
		return false;
		}

services/java/com/android/server/wm/WindowManagerService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -7669,7 +7669,8 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		if (mScreenRotationAnimation != null) {
		if (mScreenRotationAnimation.isAnimating()) {
		if (mScreenRotationAnimation.isAnimating() \|\|
		mScreenRotationAnimation.mFinishAnimReady) {
		if (mScreenRotationAnimation.startAndFinishAnimationLocked(currentTime)) {
		mInnerFields.mUpdateRotation = false;
		mInnerFields.mAnimating = true;