diff options
| author | 2017-07-25 17:00:22 +0000 | |
|---|---|---|
| committer | 2017-07-25 17:00:22 +0000 | |
| commit | 9ffa87552b7372861f90c34873ffde73cb5e2aa2 (patch) | |
| tree | 04f946151a837a7ddcff95b13033b167f1dd072a | |
| parent | f1f25ad5f294ec0ccbec0a7d4346ec7acefa1123 (diff) | |
| parent | 3162b8f7e999705bf09920974cf6e369b51bc5fe (diff) | |
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
| -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 ? |