Merge "Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3 am: 6ee44d7939" into sc-v2-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2021-07-16 17:16:47 +00:00
committed by Android (Google) Code Review

View File

@@ -10079,9 +10079,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
AccessibilityNodeInfo cinfo = provider.createAccessibilityNodeInfo(
AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i)));
ViewStructure child = structure.newChild(i);
populateVirtualStructure(child, provider, cinfo, forAutofill);
cinfo.recycle();
if (cinfo != null) {
ViewStructure child = structure.newChild(i);
populateVirtualStructure(child, provider, cinfo, forAutofill);
cinfo.recycle();
}
}
}
}