Merge "Allow screen rotation animation when entering AOD" into sc-dev

2021-05-10 02:42:52 +00:00
parent f95a681249 3f3f5fcc22
commit 5959d504be
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} */