Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8727157 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong candidate window when display immersive_mode_confirm." into... 

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

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

Change-Id: Ib3ceea0a429f3fc6bd7b78312478cad17822933e
parents 978a3a60 a56ba188

services/core/java/com/android/server/wm/DisplayPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {