Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev am: 0bf88c5ad2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166481 Change-Id: I57f9fdfb04aa016053496dda2dec0b6926e88c20
2020-07-17 23:42:15 +00:00
parent e9e55ae825 0bf88c5ad2
commit a56ba188c9
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -3292,7 +3292,7 @@ public class DisplayPolicy {
            // keys, we let it keep controlling the visibility.
            final boolean lastFocusCanReceiveKeys =
                    (mLastFocusedWindow != null && mLastFocusedWindow.canReceiveKeys());
-            winCandidate = isKeyguardShowing() ? mNotificationShade
+            winCandidate = isKeyguardShowing() && !isKeyguardOccluded() ? mNotificationShade
                    : lastFocusCanReceiveKeys ? mLastFocusedWindow
                            : mTopFullscreenOpaqueWindowState;
            if (winCandidate == null) {