From 3fc5b50024d30b8509060ae8047bca3041549f06 Mon Sep 17 00:00:00 2001
From: Issei Suzuki <issei@google.com>
Date: Wed, 17 Aug 2022 16:19:31 +0000
Subject: [PATCH] Stop calling #setOccluded when WM shell is enabled.

While keyguard is shown, WindowManager triggers remote animation for
KEYGUARD_(UN)OCCLUDE app transition. SysUI can know the up-to-date
keyguard occluded status throught this remote animation call, so
WindowManager doesn't need to trigger IKeygaurdService#setOccluded.

Bug: 242862775
Test: Existing tests pass.
Change-Id: I4ea4408ade39ff8558ac7627ad1994b388f1a6c6
---
 .../java/com/android/server/policy/PhoneWindowManager.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index d88949bcc0eca..e697a2fa5e81f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3240,8 +3240,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 {