summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2021-05-10 02:42:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-10 02:42:52 +0000
commit5959d504be8adbc06e112ac480468134a0b33ed7 (patch)
tree5c6ed5dafa79879826f94898f0661e2cbb27f070
parentf95a68124981303ca08ea6bb44d9ec674547299c (diff)
parent3f3f5fcc22010f984421afc637db559619b1fd29 (diff)
Merge "Allow screen rotation animation when entering AOD" into sc-dev
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java2
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 0a65c2367e89..b56736ee9ab7 100644
--- 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} */