Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84feea11 authored by Alan Viverette's avatar Alan Viverette
Browse files

Abort accessibility node prefetch if parent node is null

BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c
parent 6f7fd0ba
Loading
Loading
Loading
Loading
+7 −5
Original line number Original line Diff line number Diff line
@@ -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);