Merge "Allow screen rotation animation when entering AOD" into sc-dev am: 5959d504be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467779 Change-Id: Ic889fe72e0b6e23cc7f6da77ba720c16f6ad9378
2021-05-10 03:00:17 +00:00
parent d272e43966 5959d504be
commit e77cd58881
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4501,7 +4501,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

    @Override
    public boolean okToAnimate(boolean ignoreScreenOn) {
-        return (ignoreScreenOn || mDefaultDisplayPolicy.isAwake()) && !mDeviceGoingToSleep;
+        return (ignoreScreenOn || isScreenOn()) && !mDeviceGoingToSleep;
    }

    /** {@inheritDoc} */