Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev

2020-07-17 23:28:04 +00:00
parent 25602430fd 30accd2c9c
commit 0bf88c5ad2
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) {