Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166481

Change-Id: Ib3ceea0a429f3fc6bd7b78312478cad17822933e
This commit is contained in:
Wale Ogunwale
2020-07-18 00:01:02 +00:00
committed by Automerger Merge Worker
parent 978a3a6023 a56ba188c9
commit b8727157d4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -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) {