diff options
| author | 2017-07-25 17:15:44 +0000 | |
|---|---|---|
| committer | 2017-07-25 17:15:44 +0000 | |
| commit | da0f7e46d8e205e0695ca3c8312c9f1137b58eb3 (patch) | |
| tree | e50c564afe5b86fe1ae3581ef9534cb31777d226 | |
| parent | f86fdd6851038507e5eb7b459394f8e15ce2804f (diff) | |
| parent | f7f0bd5f520af0d69e95fa4514ecf6324d2da3eb (diff) | |
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev am: 9ffa87552b
am: f7f0bd5f52
Change-Id: I437715b23499e6eba5e5653fdc74c37e26f74f2c
| -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 ? |