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

Commit 30accd2c authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

Fix wrong candidate window when display immersive_mode_confirm. 

Select notification shade window as candidate window only when
keyguardShowing and !keyguardOccluded.

Bug: 160809313
Test: Manual testing based on issue description
Change-Id: I4d9183ec14086c4b8dcb50587911dbaaf50d2f15
parent c42d4b65

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

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