Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sally Yuen
2021-07-16 16:53:17 +00:00
committed by Android (Google) Code Review
parent 717af18b7e 3b548655fd
commit ea5ce681f3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/View.java
View File

@@ -10079,9 +10079,11 @@ 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)));
ViewStructure child = structure.newChild(i); if (cinfo != null) {
populateVirtualStructure(child, provider, cinfo, forAutofill); ViewStructure child = structure.newChild(i);
cinfo.recycle(); populateVirtualStructure(child, provider, cinfo, forAutofill);
cinfo.recycle();
}
} }
} }
} }