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

Commit 77557375 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider... 

am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev

* commit '16f3a7143e835464393bc21906ebec5e78ffd4d0':
  Accessibility node provider getting invalid virtual view id.
parents 7412965a 78efd1be

core/java/android/view/ViewRootImpl.java

+17 −4
Original line number Diff line number Diff line
@@ -6096,8 +6096,15 @@ public final class ViewRootImpl implements ViewParent, 
                if (source != null) {

                    AccessibilityNodeProvider provider = source.getAccessibilityNodeProvider();

                    if (provider != null) {

                        AccessibilityNodeInfo node = provider.createAccessibilityNodeInfo(

                                AccessibilityNodeInfo.getVirtualDescendantId(sourceNodeId));

                        final int virtualNodeId = AccessibilityNodeInfo.getVirtualDescendantId(

                                sourceNodeId);

                        final AccessibilityNodeInfo node;

                        if (virtualNodeId == AccessibilityNodeInfo.UNDEFINED_ITEM_ID) {

                            node = provider.createAccessibilityNodeInfo(

                                    AccessibilityNodeProvider.HOST_VIEW_ID);

                        } else {

                            node = provider.createAccessibilityNodeInfo(virtualNodeId);

                        }

                        setAccessibilityFocus(source, node);

                    }

                }
@@ -6135,8 +6142,14 @@ public final class ViewRootImpl implements ViewParent, 
                        if (provider != null) {

                            final int virtualChildId = AccessibilityNodeInfo.getVirtualDescendantId(

                                    mAccessibilityFocusedVirtualView.getSourceNodeId());

                            mAccessibilityFocusedVirtualView = provider.createAccessibilityNodeInfo(

                                    virtualChildId);

                            if (virtualChildId == AccessibilityNodeInfo.UNDEFINED_ITEM_ID) {

                                mAccessibilityFocusedVirtualView = provider

                                        .createAccessibilityNodeInfo(

                                                AccessibilityNodeProvider.HOST_VIEW_ID);

                            } else {

                                mAccessibilityFocusedVirtualView = provider

                                        .createAccessibilityNodeInfo(virtualChildId);

                            }

                        }

                    }

                }