Don't call setAutofillId() when populating virtual structure for Assit.

Change-Id: Ia96b5fd6ed7b8f7909b9df59cee57f606a0b37da
Fixes: 36503715
Test: manual verification

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5269296..6c73b9b 100644 (file)
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7677,9 +7677,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 AccessibilityNodeInfo cinfo = provider.createAccessibilityNodeInfo(
                         AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i)));
                 ViewStructure child = structure.newChild(i);
-                // TODO(b/33197203): add CTS test to autofill virtual children based on
-                // Accessibility API.
-                child.setAutofillId(structure, i);
+                if (forAutofill) {
+                    // TODO(b/33197203): add CTS test to autofill virtual children based on
+                    // Accessibility API.
+                    child.setAutofillId(structure, i);
+                }
                 populateVirtualStructure(child, provider, cinfo, forAutofill);
                 cinfo.recycle();
             }