FIx occlusion status mismatch issue when screen turns off and on quickly

When KeyguardController detects occlude status change while the keyguard
is shown, it requests (UN)OCCLUDE app transition and PhoneWindowManager
defers committing the occlude state.

However KeyguardController and PhoneWindowManager use different
predicates to decide if keygaurd is shown or not. In case the predicates
return different value, occlude state in KeyguardController and
PhoneWindowManager remain inconsistent.

Test: manual
  1. set secure lock method (pattern)
  2. launch calculator app
  3. push power button to screen off
  4. just before the screen turns off, push power button to screen on
     again
Bug: 232002936
(cherry picked from commit b71c7b4)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b323776b1b205a4b266e16fbdc4095871cc4d9ec)
Merged-In: I4cd7e62e6800897cce50a5376495c499a0b9ad10
Change-Id: I4cd7e62e6800897cce50a5376495c499a0b9ad10

Author: Issei Suzuki

services/core/java/com/android/server/policy/PhoneWindowManager.java

@@ -3312,8 +3312,8 @@ public void registerShortcutKey(long shortcutCode, IShortcutService shortcutServ
     }
 
     @Override
-    public void onKeyguardOccludedChangedLw(boolean occluded) {
-        if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) {
+    public void onKeyguardOccludedChangedLw(boolean occluded, boolean waitAppTransition) {
+        if (mKeyguardDelegate != null && waitAppTransition) {
             mPendingKeyguardOccluded = occluded;
             mKeyguardOccludedChanged = true;
         } else {

services/core/java/com/android/server/policy/WindowManagerPolicy.java

@@ -166,9 +166,10 @@ void registerShortcutKey(long shortcutCode, IShortcutService shortcutKeyReceiver
 
     /**
      * Called when the Keyguard occluded state changed.
+     *
      * @param occluded Whether Keyguard is currently occluded or not.
      */
-    void onKeyguardOccludedChangedLw(boolean occluded);
+    void onKeyguardOccludedChangedLw(boolean occluded, boolean waitAppTransition);
 
     /**
      * Applies a keyguard occlusion change if one happened.

services/core/java/com/android/server/wm/KeyguardController.java

@@ -403,8 +403,10 @@ private void handleOccludedChanged(int displayId, @Nullable ActivityRecord topAc
             return;
         }
 
-        mWindowManager.mPolicy.onKeyguardOccludedChangedLw(isDisplayOccluded(DEFAULT_DISPLAY));
-        if (isKeyguardLocked(displayId)) {
+        final boolean waitAppTransition = isKeyguardLocked(displayId);
+        mWindowManager.mPolicy.onKeyguardOccludedChangedLw(isDisplayOccluded(DEFAULT_DISPLAY),
+                waitAppTransition);
+        if (waitAppTransition) {
             mService.deferWindowLayout();
             try {
                 mRootWindowContainer.getDefaultDisplay()

services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java

@@ -222,7 +222,7 @@ public boolean isKeyguardDrawnLw() {
     }
 
     @Override
-    public void onKeyguardOccludedChangedLw(boolean occluded) {
+    public void onKeyguardOccludedChangedLw(boolean occluded, boolean waitAppTransition) {
     }
 
     public void setSafeMode(boolean safeMode) {