diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 3f4f629b52924..a8de3a844599c 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -6126,7 +6126,7 @@ public class WindowManagerService extends IWindowManager.Stub } mRoot.forAllWindows((w) -> { - if ((!visibleOnly || w.mWinAnimator.getShown()) + if ((!visibleOnly || w.isVisible()) && (!appsOnly || w.mActivityRecord != null)) { windows.add(w); }