diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 592eaec7f31d2..505051fcb9d2a 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1488,6 +1488,13 @@ class DisplayContent extends WindowContainer + w.mOwnerUid == uid && w.isFocused()); + if (focusedWindowForUid != null) { + return true; + } final WindowState win = getWindow(w -> w.mAttrs.type == TYPE_TOAST && w.mOwnerUid == uid && !w.mPermanentlyHidden && !w.mWindowRemovalAllowed);