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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467779 Change-Id: Ifa6aba8047db3c50ad18b66c7acf9600c51dd679
2021-05-10 03:16:19 +00:00
parent 18a467be42 e77cd58881
commit dd0710a263
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} */