Defer to real framework code for AccessibilityWindowInfo.getWindowId

The Robolectric implementation of returning -1 was incorrect for API levels pre-O. PiperOrigin-RevId: 695389549
robolectric · Nov 15, 2024 · 68e04b8 · 68e04b8
1 parent 434e22d
commit 68e04b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...sts/ctesque/src/sharedTest/java/android/view/accessibility/AccessibilityNodeInfoTest.java b/...sts/ctesque/src/sharedTest/java/android/view/accessibility/AccessibilityNodeInfoTest.java
@@ -59,6 +59,13 @@ public void testConstructor() {
     assertThat(secondInfo.getWindowId()).isEqualTo(firstInfo.getWindowId());
   }
 
+  /** Pre-O, the window id is set to Integer.MAX_VALUE. Post-O, the window id is set to -1. */
+  @Test
+  public void obtain_noArgs_windowId() {
+    assertThat(AccessibilityNodeInfo.obtain().getWindowId())
+        .isEqualTo(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? -1 : Integer.MAX_VALUE);
+  }
+
   @Test
   public void obtain_withWindow_returnsWindowId() {
     try (ActivityScenario<ActivityWithAnotherTheme> scenario =
@@ -103,6 +110,7 @@ public void directAccessibilityConnection_queryChildCount() {
             node.setQueryFromAppProcessEnabled(rootView, true);
             assertThat(node.getChildCount()).isEqualTo(1);
             assertThat(node.getChild(0)).isNotNull();
+            assertThat(node.getWindowId()).isEqualTo(-1);
           });
     }
   }

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowAccessibilityNodeInfoTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowAccessibilityNodeInfoTest.java
@@ -306,7 +306,8 @@ public void getSourceNodeId_notZero() {
   @Test
   public void testConstructor() {
     AccessibilityNodeInfo node = AccessibilityNodeInfo.obtain();
-    assertThat(node.getWindowId()).isEqualTo(AccessibilityWindowInfo.UNDEFINED_WINDOW_ID);
+    assertThat(node.getWindowId())
+        .isEqualTo(RuntimeEnvironment.getApiLevel() >= O ? -1 : Integer.MAX_VALUE);
     if (RuntimeEnvironment.getApiLevel() >= O) {
       // This constant does not exists pre-O.
       assertThat(node.getSourceNodeId()).isEqualTo(AccessibilityNodeInfo.UNDEFINED_NODE_ID);

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
@@ -512,10 +512,10 @@ protected AccessibilityWindowInfo getWindow() {
   /** Returns the id of the window from which the info comes. */
   @Implementation
   protected int getWindowId() {
-    if (useRealAni()) {
+    if (useRealAni() || accessibilityWindowInfo == null) {
       return accessibilityNodeInfoReflector.getWindowId();
     }
-    return (accessibilityWindowInfo == null) ? -1 : accessibilityWindowInfo.getId();
+    return accessibilityWindowInfo.getId();
   }
 
   public void setAccessibilityWindowInfo(AccessibilityWindowInfo info) {