DO NOT MERGE Don't hide IME when keyguard is just occluded.

Occluded can be true even when keyguard isn't showing, so an IME might
be hidden if it's attempted to be shown while keyguard isn't up.

Because of changes made in ag/3022559, when keyguard is occluded and
it's in use, it will now actually report as "showing" rather than not
showing in order to match the phone behavior, so this shouldn't have
any side effects.

Bug: 72027687
Change-Id: Ie570b9574c9b22452649a9b044853609476bfa91

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 9b20698..27cda1f 100644 (file)
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3056,7 +3056,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         }
 
         boolean keyguardLocked =
-                mKeyguardDelegate != null && (mKeyguardDelegate.isShowing() || mKeyguardOccluded);
+                mKeyguardDelegate != null && mKeyguardDelegate.isShowing();
         boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER
                 && !mWindowManagerInternal.isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
         return (keyguardLocked && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY)