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

Commit 239a0c0e authored by Alan Viverette's avatar Alan Viverette
Browse files

Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant. 

Internal state must be cleared before calling any methods on the focus
host, since the method may be called again from the host and attempt to
recycle the same AccessibilityNodeInfo twice.

BUG: 8856860
Change-Id: I0410989fd6f3ce3ce29de8edebdfbf3847188843
parent 81a8bb1c

core/java/android/view/ViewRootImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -2709,7 +2709,6 @@ public final class ViewRootImpl implements ViewParent, 


            AccessibilityNodeInfo focusNode = mAccessibilityFocusedVirtualView;

            View focusHost = mAccessibilityFocusedHost;

            focusHost.clearAccessibilityFocusNoCallbacks();



            // Wipe the state of the current accessibility focus since

            // the call into the provider to clear accessibility focus
@@ -2719,6 +2718,10 @@ public final class ViewRootImpl implements ViewParent, 
            mAccessibilityFocusedHost = null;

            mAccessibilityFocusedVirtualView = null;



            // Clear accessibility focus on the host after clearing state since

            // this method may be reentrant.

            focusHost.clearAccessibilityFocusNoCallbacks();



            AccessibilityNodeProvider provider = focusHost.getAccessibilityNodeProvider();

            if (provider != null) {

                // Invalidate the area of the cleared accessibility focus.