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

Commit 01268c2e 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: 49b350a4 am: a63f796e

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

Change-Id: I269a9b43c2c63608a9c89889f118b6b1572dd30e
parents b1cd171b a63f796e

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