diff options
| author | 2020-07-18 00:01:33 +0000 | |
|---|---|---|
| committer | 2020-07-18 00:01:33 +0000 | |
| commit | ba36f779613b27e7f2e2ec995e7db04f732913f0 (patch) | |
| tree | 3f75b4ab7b95e3328fc1a1aa2e3e53b1edced8fb | |
| parent | 7b43feb049eeb10bdca426adc4c86eccf6d272a7 (diff) | |
| parent | a56ba188c9c481e9a973ce8e3c999a9bd7d600f2 (diff) | |
Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev am: 0bf88c5ad2 am: a56ba188c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166481
Change-Id: I74c2761696655e02c31283c287c7bb2e2d04ed2b
| -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 605d0b2cc127..0d467c50aa11 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) { |