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

Commit a77e349a authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 

* commit '9c95264e':
  Abort accessibility node prefetch if parent node is null
parents bf8e9884 9c95264e

core/java/android/view/AccessibilityInteractionController.java

+7 −5
Original line number Diff line number Diff line
@@ -1109,15 +1109,17 @@ final class AccessibilityInteractionController { 
                        || accessibilityViewId == providerHost.getAccessibilityViewId()) {

                    final AccessibilityNodeInfo parent;

                    if (virtualDescendantId != AccessibilityNodeInfo.UNDEFINED_ITEM_ID) {

                        parent = provider.createAccessibilityNodeInfo(

                                virtualDescendantId);

                        parent = provider.createAccessibilityNodeInfo(virtualDescendantId);

                    } else {

                        parent = provider.createAccessibilityNodeInfo(

                                AccessibilityNodeProvider.HOST_VIEW_ID);

                    }

                    if (parent != null) {

                        outInfos.add(parent);

                    if (parent == null) {

                        // Couldn't obtain the parent, which means we have a

                        // disconnected sub-tree. Abort prefetch immediately.

                        return;

                    }

                    outInfos.add(parent);

                    parentNodeId = parent.getParentNodeId();

                    accessibilityViewId = AccessibilityNodeInfo.getAccessibilityViewId(

                            parentNodeId);