From 70764c141ad198dcbdb2580679906fbd29ea9d3a Mon Sep 17 00:00:00 2001 From: ryanlwlin Date: Tue, 31 May 2022 13:48:08 +0800 Subject: [PATCH] Drop the cloned windows from visible window list Currently the cloned windows is avaialbe from window list, however the node info from the cloned window is incorrect. To avoid confusion, we would drop them for a short term solution. Bug: 230300971 Test: manually test with switchaccess adb shell dumpsys accessibility to observe the window list Change-Id: I7a03376567698a493c9eb5e26d1f3390aacdb408 --- core/java/android/view/InputWindowHandle.java | 1 + .../com/android/server/wm/AccessibilityWindowsPopulator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/view/InputWindowHandle.java b/core/java/android/view/InputWindowHandle.java index 0b05d94663ccb..2922ad6ff6a87 100644 --- a/core/java/android/view/InputWindowHandle.java +++ b/core/java/android/view/InputWindowHandle.java @@ -210,6 +210,7 @@ public final class InputWindowHandle { .append(", scaleFactor=").append(scaleFactor) .append(", transform=").append(transform) .append(", windowToken=").append(windowToken) + .append(", isClone=").append(isClone) .toString(); } diff --git a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java index 6e5011dacd82a..3b4aa8e6b701d 100644 --- a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java +++ b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java @@ -154,7 +154,7 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { for (InputWindowHandle window : windowHandles) { final boolean visible = (window.inputConfig & InputConfig.NOT_VISIBLE) == 0; - if (visible && window.getWindow() != null) { + if (visible && window.getWindow() != null && !window.isClone) { tempVisibleWindows.add(window); } }