Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305983

Change-Id: I113cb66c172204f898c12e77df5a0b85df643d1e
This commit is contained in:
Sally Yuen
2021-07-16 17:15:46 +00:00
committed by Automerger Merge Worker

View File

@@ -10079,12 +10079,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
} }
AccessibilityNodeInfo cinfo = provider.createAccessibilityNodeInfo( AccessibilityNodeInfo cinfo = provider.createAccessibilityNodeInfo(
AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i))); AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i)));
if (cinfo != null) {
ViewStructure child = structure.newChild(i); ViewStructure child = structure.newChild(i);
populateVirtualStructure(child, provider, cinfo, forAutofill); populateVirtualStructure(child, provider, cinfo, forAutofill);
cinfo.recycle(); cinfo.recycle();
} }
} }
} }
}
/** /**
* Dispatch creation of {@link ViewStructure} down the hierarchy. The default * Dispatch creation of {@link ViewStructure} down the hierarchy. The default