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: Icd17aeb6cdb7b06cf6bb097b225f23f884869ee4
This commit is contained in:
Sally Yuen
2021-07-16 16:56:04 +00:00
committed by Automerger Merge Worker

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();
}
}
}
}