Merge "Stop calling #setOccluded when WM shell is enabled." into tm-qpr-dev

2022-08-23 16:39:12 +00:00
parent 321e58d85b 3fc5b50024
commit 69dbf9ff31
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3245,8 +3245,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

    @Override
    public void onKeyguardOccludedChangedLw(boolean occluded) {
-        if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()
-                && !WindowManagerService.sEnableShellTransitions) {
+        if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) {
            mPendingKeyguardOccluded = occluded;
            mKeyguardOccludedChanged = true;
        } else {