fix: guard android drawing order metadata

Author: thymikee

android-snapshot-helper/README.md

@@ -51,7 +51,8 @@ The APK emits instrumentation status records using
 The XML node attributes intentionally mirror fields consumed by the host parser, including
 `visible-to-user`, `drawing-order`, bounds, text/description/id, interaction booleans, and window
 metadata on window roots. `drawing-order` lets the host suppress covered same-window surfaces that
-the helper traversal can receive even when they are not user-reachable.
+the helper traversal can receive even when they are not user-reachable. The helper emits
+`drawing-order` on Android API 24+ and omits it on API 23, where the platform API is unavailable.
 
 Each XML chunk is sent with:
 

android-snapshot-helper/src/main/java/com/callstack/agentdevice/snapshothelper/SnapshotInstrumentation.java

@@ -4,6 +4,7 @@
 import android.app.Instrumentation;
 import android.app.UiAutomation;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Base64;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -513,7 +514,7 @@ private static void appendNode(
     appendNonEmptyAttribute(xml, "package", node.getPackageName());
     appendNonEmptyAttribute(xml, "content-desc", node.getContentDescription());
     appendAttribute(xml, "visible-to-user", Boolean.toString(node.isVisibleToUser()));
-    appendAttribute(xml, "drawing-order", Integer.toString(node.getDrawingOrder()));
+    appendDrawingOrderAttribute(xml, node);
     appendTrueAttribute(xml, "clickable", node.isClickable());
     appendAttribute(xml, "enabled", Boolean.toString(node.isEnabled()));
     appendTrueAttribute(xml, "focusable", node.isFocusable());
@@ -585,6 +586,12 @@ private static void appendTrueAttribute(StringBuilder xml, String name, boolean
     }
   }
 
+  private static void appendDrawingOrderAttribute(StringBuilder xml, AccessibilityNodeInfo node) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      appendAttribute(xml, "drawing-order", Integer.toString(node.getDrawingOrder()));
+    }
+  }
+
   private static void appendWindowMetadata(StringBuilder xml, WindowMetadata metadata) {
     appendAttribute(xml, "window-index", Integer.toString(metadata.index));
     appendAttribute(xml, "window-type", Integer.toString(metadata.type));

src/platforms/android/__tests__/index.test.ts

@@ -383,6 +383,52 @@ test('parseUiHierarchy keeps lower siblings when drawing-order metadata is unava
   );
 });
 
+test('parseUiHierarchy keeps overlapping siblings when drawing-order ties', () => {
+  const xml = `<hierarchy>
+  <node class="android.widget.FrameLayout" bounds="[0,0][390,844]" visible-to-user="true" drawing-order="0">
+    <node class="android.view.ViewGroup" bounds="[0,0][390,844]" visible-to-user="true" drawing-order="1">
+      <node class="android.widget.Button" text="First tied action" bounds="[24,420][366,480]" clickable="true" enabled="true" visible-to-user="true" drawing-order="1"/>
+    </node>
+    <node class="android.view.ViewGroup" bounds="[0,0][390,844]" visible-to-user="true" drawing-order="1">
+      <node class="android.widget.Button" text="Second tied action" bounds="[0,220][280,280]" clickable="true" enabled="true" visible-to-user="true" drawing-order="1"/>
+    </node>
+  </node>
+</hierarchy>`;
+
+  const result = parseUiHierarchy(xml, 800, { raw: true });
+  assert.equal(
+    result.nodes.some((node) => node.label === 'First tied action'),
+    true,
+  );
+  assert.equal(
+    result.nodes.some((node) => node.label === 'Second tied action'),
+    true,
+  );
+});
+
+test('parseUiHierarchy keeps lower siblings below the covered-area threshold', () => {
+  const xml = `<hierarchy>
+  <node class="android.widget.FrameLayout" bounds="[0,0][390,844]" visible-to-user="true" drawing-order="0">
+    <node class="android.view.ViewGroup" bounds="[0,0][390,717]" visible-to-user="true" drawing-order="2">
+      <node class="android.widget.Button" text="Partial overlay action" bounds="[24,420][366,480]" clickable="true" enabled="true" visible-to-user="true" drawing-order="1"/>
+    </node>
+    <node class="android.view.ViewGroup" bounds="[0,0][390,844]" visible-to-user="true" drawing-order="1">
+      <node class="android.widget.Button" text="Mostly visible action" bounds="[0,760][280,820]" clickable="true" enabled="true" visible-to-user="true" drawing-order="1"/>
+    </node>
+  </node>
+</hierarchy>`;
+
+  const result = parseUiHierarchy(xml, 800, { raw: true });
+  assert.equal(
+    result.nodes.some((node) => node.label === 'Partial overlay action'),
+    true,
+  );
+  assert.equal(
+    result.nodes.some((node) => node.label === 'Mostly visible action'),
+    true,
+  );
+});
+
 test('parseUiHierarchy keeps lower siblings covered only by non-agent-visible overlays', () => {
   const xml = `<hierarchy>
   <node class="android.widget.FrameLayout" bounds="[0,0][390,844]" visible-to-user="true" drawing-order="0">