diff options
| author | 2017-07-25 15:37:32 +0200 | |
|---|---|---|
| committer | 2017-07-25 15:37:32 +0200 | |
| commit | 3162b8f7e999705bf09920974cf6e369b51bc5fe (patch) | |
| tree | 8fd9df2d635b027ce29e71326519ab1773f02949 | |
| parent | aaf3860941f8a7eb631c50755a04b5a8aed003ac (diff) | |
AOD: Fix rotation during screen off (again)
Fixes another issue where the screen could rotate during the screen-off transition.
mAwake is still true during goingToSleep, but we should no longer play rotation
animations if we are going to sleep. Instead use the more appropriately named
okToAnimate.
Change-Id: I816d1552de3fea0a19ce42ca50d845eb46f80625
Fixes: 63760853
Test: Trigger show-when-locked navigation, rotate phone to landscape, trigger assistant, go to sleep. Verify no rotation plays; go/wm-smoke
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 7a41e8a50ace..e89ab1de7b65 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3164,7 +3164,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void selectRotationAnimationLw(int anim[]) { // If the screen is off or non-interactive, force a jumpcut. - final boolean forceJumpcut = !mScreenOnFully || !mAwake; + final boolean forceJumpcut = !mScreenOnFully || !okToAnimate(); if (PRINT_ANIM) Slog.i(TAG, "selectRotationAnimation mTopFullscreen=" + mTopFullscreenOpaqueWindowState + " rotationAnimation=" + (mTopFullscreenOpaqueWindowState == null ? |