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

Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-11-05 01:41:26 +00:00
committed by Android (Google) Code Review
parent 26a733ce33 84feea1185
commit 9c95264e84
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/AccessibilityInteractionController.java
View File

@@ -1109,15 +1109,17 @@ final class AccessibilityInteractionController {
|| accessibilityViewId == providerHost.getAccessibilityViewId()) { || accessibilityViewId == providerHost.getAccessibilityViewId()) {
final AccessibilityNodeInfo parent; final AccessibilityNodeInfo parent;
if (virtualDescendantId != AccessibilityNodeInfo.UNDEFINED_ITEM_ID) { if (virtualDescendantId != AccessibilityNodeInfo.UNDEFINED_ITEM_ID) {
parent = provider.createAccessibilityNodeInfo( parent = provider.createAccessibilityNodeInfo(virtualDescendantId);
virtualDescendantId);
} else { } else {
parent = provider.createAccessibilityNodeInfo( parent = provider.createAccessibilityNodeInfo(
AccessibilityNodeProvider.HOST_VIEW_ID); AccessibilityNodeProvider.HOST_VIEW_ID);
} }
if (parent != null) { if (parent == null) {
outInfos.add(parent); // Couldn't obtain the parent, which means we have a
// disconnected sub-tree. Abort prefetch immediately.
return;
} }
outInfos.add(parent);
parentNodeId = parent.getParentNodeId(); parentNodeId = parent.getParentNodeId();
accessibilityViewId = AccessibilityNodeInfo.getAccessibilityViewId( accessibilityViewId = AccessibilityNodeInfo.getAccessibilityViewId(
parentNodeId); parentNodeId);