commit 9ffa87552b7372861f90c34873ffde73cb5e2aa2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 25 17:00:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 25 17:00:22 2017 +0000
tree 04f946151a837a7ddcff95b13033b167f1dd072a
parent f1f25ad5f294ec0ccbec0a7d4346ec7acefa1123
parent 3162b8f7e999705bf09920974cf6e369b51bc5fe

Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 7a41e8a..e89ab1d 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 @@
     @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 ?