diff options
| author | 2020-07-18 00:15:17 +0000 | |
|---|---|---|
| committer | 2020-07-18 00:15:17 +0000 | |
| commit | 3dbf49d9c842b10194081cbad57c4be78fe203cb (patch) | |
| tree | f587bf276861d9001fa11cb747ae2cfb8f9f6060 | |
| parent | b1cd171b2001203233e6736c6bf9f697e39c81ca (diff) | |
| parent | b8727157d42b285a91fc1eccdfaa515e9090488f (diff) | |
Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev am: 0bf88c5ad2 am: a56ba188c9 am: b8727157d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166481
Change-Id: Id71d31c606f33a96329b125136f665c54743f183
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayPolicy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 8e0bbd6380eb..6a90f2994238 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -3407,7 +3407,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) { |