From 30accd2c9c80ef8e9a6ac27abf1286f6a14bc2e8 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Thu, 16 Jul 2020 11:12:33 +0800 Subject: Fix wrong candidate window when display immersive_mode_confirm. Select notification shade window as candidate window only when keyguardShowing and !keyguardOccluded. Bug: 160809313 Test: Manual testing based on issue description Change-Id: I4d9183ec14086c4b8dcb50587911dbaaf50d2f15 --- services/core/java/com/android/server/wm/DisplayPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 68051ab59599..6835e8a44b3c 100644 --- 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) { -- cgit v1.2.3-59-g8ed1b