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

Commit 103dd32a authored by Qasid Ahmad Sadiq's avatar Qasid Ahmad Sadiq
Browse files

Prefetching can be interupted by other service requests. 

Slow prefetch requests would block user interactive requests, creating
noticeable sluggishness and unresponsiveness in accessibility services,
especially on the web.

Let's make it so a user interactive requests stops prefetching.
We can't interupt an API call, but we can stop in between API calls.

On the service side, we have to seprate the prefetch callbacks from the
find callback. And we have to make it asynchrnous. It does dispatch into
the main thread, so the AccessibilityCache can remain single threaded.

When the calls are interupted on the application side, returnPendingFindAccessibilityNodeInfosInPrefetch checks the find requests that are waiting in the queue, to see if they can be addressed by the prefetch results. If they can be, we don't have to call into potentially imperformance application code.

Bug:30969887
Test: Performance measurements, tried it out by hand to see if their are any bugs. CTSAccessibility*

Change-Id: Ia8f1152afa3987f262f37ed4583775acdd32db43
parent 312aae75

core/java/android/view/AccessibilityInteractionController.java

+165 −117
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ public final class AccessibilityInteractionController { 


    private AddNodeInfosForViewId mAddNodeInfosForViewId;



    private List<Message> mPendingFindNodeByIdMessages;



    @GuardedBy("mLock")

    private int mNumActiveRequestPreparers;

    @GuardedBy("mLock")
@@ -128,6 +130,7 @@ public final class AccessibilityInteractionController { 
        mViewRootImpl = viewRootImpl;

        mPrefetcher = new AccessibilityNodePrefetcher();

        mA11yManager = mViewRootImpl.mContext.getSystemService(AccessibilityManager.class);

        mPendingFindNodeByIdMessages = new ArrayList<>();

    }



    private void scheduleMessage(Message message, int interrogatingPid, long interrogatingTid,
@@ -177,6 +180,7 @@ public final class AccessibilityInteractionController { 
        args.arg4 = arguments;

        message.obj = args;



        mPendingFindNodeByIdMessages.add(message);

        scheduleMessage(message, interrogatingPid, interrogatingTid, CONSIDER_REQUEST_PREPARERS);

    }
@@ -315,6 +319,8 @@ public final class AccessibilityInteractionController { 
    }



    private void findAccessibilityNodeInfoByAccessibilityIdUiThread(Message message) {

        mPendingFindNodeByIdMessages.remove(message);



        final int flags = message.arg1;



        SomeArgs args = (SomeArgs) message.obj;
@@ -329,22 +335,58 @@ public final class AccessibilityInteractionController { 


        args.recycle();



        List<AccessibilityNodeInfo> infos = mTempAccessibilityNodeInfoList;

        infos.clear();

        View rootView = null;

        AccessibilityNodeInfo rootNode = null;

        try {

            if (mViewRootImpl.mView == null || mViewRootImpl.mAttachInfo == null) {

                return;

            }

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;

            final View root = findViewByAccessibilityId(accessibilityViewId);

            if (root != null && isShown(root)) {

                mPrefetcher.prefetchAccessibilityNodeInfos(

                        root, virtualDescendantId, flags, infos, arguments);

            rootView = findViewByAccessibilityId(accessibilityViewId);

            if (rootView != null && isShown(rootView)) {

                rootNode = populateAccessibilityNodeInfoForView(

                        rootView, arguments, virtualDescendantId);

            }

        } finally {

            updateInfosForViewportAndReturnFindNodeResult(

                    infos, callback, interactionId, spec, interactiveRegion);

            updateInfoForViewportAndReturnFindNodeResult(

                    rootNode == null ? null : AccessibilityNodeInfo.obtain(rootNode),

                    callback, interactionId, spec, interactiveRegion);

        }

        List<AccessibilityNodeInfo> infos = mTempAccessibilityNodeInfoList;

        infos.clear();

        mPrefetcher.prefetchAccessibilityNodeInfos(

                rootView, rootNode == null ? null : AccessibilityNodeInfo.obtain(rootNode),

                virtualDescendantId, flags, infos);

        mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

        updateInfosForViewPort(infos, spec, interactiveRegion);

        returnPrefetchResult(interactionId, infos, callback);

        returnPendingFindAccessibilityNodeInfosInPrefetch(infos);

    }



    private AccessibilityNodeInfo populateAccessibilityNodeInfoForView(

            View view, Bundle arguments, int virtualViewId) {

        AccessibilityNodeProvider provider = view.getAccessibilityNodeProvider();

        // Determine if we'll be populating extra data

        final String extraDataRequested = (arguments == null) ? null

                : arguments.getString(EXTRA_DATA_REQUESTED_KEY);

        AccessibilityNodeInfo root = null;

        if (provider == null) {

            root = view.createAccessibilityNodeInfo();

            if (root != null) {

                if (extraDataRequested != null) {

                    view.addExtraDataToAccessibilityNodeInfo(root, extraDataRequested, arguments);

                }

            }

        } else {

            root = provider.createAccessibilityNodeInfo(virtualViewId);

            if (root != null) {

                if (extraDataRequested != null) {

                    provider.addExtraDataToAccessibilityNodeInfo(

                            virtualViewId, root, extraDataRequested, arguments);

                }

            }

        }

        return root;

    }



    public void findAccessibilityNodeInfosByViewIdClientThread(long accessibilityNodeId,
@@ -402,6 +444,7 @@ public final class AccessibilityInteractionController { 
                mAddNodeInfosForViewId.reset();

            }

        } finally {

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

            updateInfosForViewportAndReturnFindNodeResult(

                    infos, callback, interactionId, spec, interactiveRegion);

        }
@@ -484,6 +527,7 @@ public final class AccessibilityInteractionController { 
                }

            }

        } finally {

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

            updateInfosForViewportAndReturnFindNodeResult(

                    infos, callback, interactionId, spec, interactiveRegion);

        }
@@ -575,6 +619,7 @@ public final class AccessibilityInteractionController { 
                }

            }

        } finally {

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

            updateInfoForViewportAndReturnFindNodeResult(

                    focused, callback, interactionId, spec, interactiveRegion);

        }
@@ -629,6 +674,7 @@ public final class AccessibilityInteractionController { 
                }

            }

        } finally {

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

            updateInfoForViewportAndReturnFindNodeResult(

                    next, callback, interactionId, spec, interactiveRegion);

        }
@@ -785,33 +831,6 @@ public final class AccessibilityInteractionController { 
        }

    }



    private void applyAppScaleAndMagnificationSpecIfNeeded(List<AccessibilityNodeInfo> infos,

            MagnificationSpec spec) {

        if (infos == null) {

            return;

        }

        final float applicationScale = mViewRootImpl.mAttachInfo.mApplicationScale;

        if (shouldApplyAppScaleAndMagnificationSpec(applicationScale, spec)) {

            final int infoCount = infos.size();

            for (int i = 0; i < infoCount; i++) {

                AccessibilityNodeInfo info = infos.get(i);

                applyAppScaleAndMagnificationSpecIfNeeded(info, spec);

            }

        }

    }



    private void adjustIsVisibleToUserIfNeeded(List<AccessibilityNodeInfo> infos,

            Region interactiveRegion) {

        if (interactiveRegion == null || infos == null) {

            return;

        }

        final int infoCount = infos.size();

        for (int i = 0; i < infoCount; i++) {

            AccessibilityNodeInfo info = infos.get(i);

            adjustIsVisibleToUserIfNeeded(info, interactiveRegion);

        }

    }



    private void adjustIsVisibleToUserIfNeeded(AccessibilityNodeInfo info,

            Region interactiveRegion) {

        if (interactiveRegion == null || info == null) {
@@ -832,17 +851,6 @@ public final class AccessibilityInteractionController { 
        return false;

    }



    private void adjustBoundsInScreenIfNeeded(List<AccessibilityNodeInfo> infos) {

        if (infos == null || shouldBypassAdjustBoundsInScreen()) {

            return;

        }

        final int infoCount = infos.size();

        for (int i = 0; i < infoCount; i++) {

            final AccessibilityNodeInfo info = infos.get(i);

            adjustBoundsInScreenIfNeeded(info);

        }

    }



    private void adjustBoundsInScreenIfNeeded(AccessibilityNodeInfo info) {

        if (info == null || shouldBypassAdjustBoundsInScreen()) {

            return;
@@ -890,17 +898,6 @@ public final class AccessibilityInteractionController { 
        return screenMatrix == null || screenMatrix.isIdentity();

    }



    private void associateLeashedParentIfNeeded(List<AccessibilityNodeInfo> infos) {

        if (infos == null || shouldBypassAssociateLeashedParent()) {

            return;

        }

        final int infoCount = infos.size();

        for (int i = 0; i < infoCount; i++) {

            final AccessibilityNodeInfo info = infos.get(i);

            associateLeashedParentIfNeeded(info);

        }

    }



    private void associateLeashedParentIfNeeded(AccessibilityNodeInfo info) {

        if (info == null || shouldBypassAssociateLeashedParent()) {

            return;
@@ -974,18 +971,46 @@ public final class AccessibilityInteractionController { 
        return (appScale != 1.0f || (spec != null && !spec.isNop()));

    }



    private void updateInfosForViewPort(List<AccessibilityNodeInfo> infos, MagnificationSpec spec,

                                        Region interactiveRegion) {

        for (int i = 0; i < infos.size(); i++) {

            updateInfoForViewPort(infos.get(i), spec, interactiveRegion);

        }

    }



    private void updateInfoForViewPort(AccessibilityNodeInfo info, MagnificationSpec spec,

                                       Region interactiveRegion) {

        associateLeashedParentIfNeeded(info);

        applyScreenMatrixIfNeeded(info);

        adjustBoundsInScreenIfNeeded(info);

        // To avoid applyAppScaleAndMagnificationSpecIfNeeded changing the bounds of node,

        // then impact the visibility result, we need to adjust visibility before apply scale.

        adjustIsVisibleToUserIfNeeded(info, interactiveRegion);

        applyAppScaleAndMagnificationSpecIfNeeded(info, spec);

    }



    private void updateInfosForViewportAndReturnFindNodeResult(List<AccessibilityNodeInfo> infos,

            IAccessibilityInteractionConnectionCallback callback, int interactionId,

            MagnificationSpec spec, Region interactiveRegion) {

        if (infos != null) {

            updateInfosForViewPort(infos, spec, interactiveRegion);

        }

        returnFindNodesResult(infos, callback, interactionId);

    }



    private void returnFindNodeResult(AccessibilityNodeInfo info,

                                      IAccessibilityInteractionConnectionCallback callback,

                                      int interactionId) {

        try {

            callback.setFindAccessibilityNodeInfoResult(info, interactionId);

        } catch (RemoteException re) {

            /* ignore - the other side will time out */

        }

    }



    private void returnFindNodesResult(List<AccessibilityNodeInfo> infos,

            IAccessibilityInteractionConnectionCallback callback, int interactionId) {

        try {

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

            associateLeashedParentIfNeeded(infos);

            applyScreenMatrixIfNeeded(infos);

            adjustBoundsInScreenIfNeeded(infos);

            // To avoid applyAppScaleAndMagnificationSpecIfNeeded changing the bounds of node,

            // then impact the visibility result, we need to adjust visibility before apply scale.

            adjustIsVisibleToUserIfNeeded(infos, interactiveRegion);

            applyAppScaleAndMagnificationSpecIfNeeded(infos, spec);

            callback.setFindAccessibilityNodeInfosResult(infos, interactionId);

            if (infos != null) {

                infos.clear();
@@ -995,22 +1020,49 @@ public final class AccessibilityInteractionController { 
        }

    }



    private void updateInfoForViewportAndReturnFindNodeResult(AccessibilityNodeInfo info,

            IAccessibilityInteractionConnectionCallback callback, int interactionId,

            MagnificationSpec spec, Region interactiveRegion) {

    private void returnPendingFindAccessibilityNodeInfosInPrefetch(

            List<AccessibilityNodeInfo> infos) {

        for (Message pendingMessage : mPendingFindNodeByIdMessages) {

            SomeArgs args = (SomeArgs) pendingMessage.obj;

            final int accessibilityViewId = args.argi1;

            final int virtualDescendantId = args.argi2;

            final int interactionId = args.argi3;

            final IAccessibilityInteractionConnectionCallback callback =

                    (IAccessibilityInteractionConnectionCallback) args.arg1;

            final long nodeId =

                    AccessibilityNodeInfo.makeNodeId(accessibilityViewId, virtualDescendantId);

            for (int i = 0; i < infos.size(); i++) {

                AccessibilityNodeInfo info = infos.get(i);

                if (info.getSourceNodeId() == nodeId) {

                    returnFindNodeResult(

                            AccessibilityNodeInfo.obtain(info), callback, interactionId);

                    mHandler.removeMessages(

                            PrivateHandler.MSG_FIND_ACCESSIBILITY_NODE_INFO_BY_ACCESSIBILITY_ID,

                            pendingMessage.obj);

                    args.recycle();

                    break;

                }

            }

        }

        mPendingFindNodeByIdMessages.clear();

    }



    private void returnPrefetchResult(int interactionId, List<AccessibilityNodeInfo> infos,

                                      IAccessibilityInteractionConnectionCallback callback) {

        if (infos.size() > 0) {

            try {

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;

            associateLeashedParentIfNeeded(info);

            applyScreenMatrixIfNeeded(info);

            adjustBoundsInScreenIfNeeded(info);

            // To avoid applyAppScaleAndMagnificationSpecIfNeeded changing the bounds of node,

            // then impact the visibility result, we need to adjust visibility before apply scale.

            adjustIsVisibleToUserIfNeeded(info, interactiveRegion);

            applyAppScaleAndMagnificationSpecIfNeeded(info, spec);

            callback.setFindAccessibilityNodeInfoResult(info, interactionId);

                callback.setPrefetchAccessibilityNodeInfoResult(infos, interactionId);

            } catch (RemoteException re) {

                /* ignore - the other side will time out */

                /* ignore - other side isn't too bothered if this doesn't arrive */

            }

        }

    }



    private void updateInfoForViewportAndReturnFindNodeResult(AccessibilityNodeInfo info,

            IAccessibilityInteractionConnectionCallback callback, int interactionId,

            MagnificationSpec spec, Region interactiveRegion) {

        updateInfoForViewPort(info, spec, interactiveRegion);

        returnFindNodeResult(info, callback, interactionId);

    }



    private boolean handleClickableSpanActionUiThread(
@@ -1053,20 +1105,11 @@ public final class AccessibilityInteractionController { 


        private final ArrayList<View> mTempViewList = new ArrayList<View>();



        public void prefetchAccessibilityNodeInfos(View view, int virtualViewId, int fetchFlags,

                List<AccessibilityNodeInfo> outInfos, Bundle arguments) {

        public void prefetchAccessibilityNodeInfos(View view, AccessibilityNodeInfo root,

                int virtualViewId, int fetchFlags, List<AccessibilityNodeInfo> outInfos) {

            if (root != null) {

                AccessibilityNodeProvider provider = view.getAccessibilityNodeProvider();

            // Determine if we'll be populating extra data

            final String extraDataRequested = (arguments == null) ? null

                    : arguments.getString(EXTRA_DATA_REQUESTED_KEY);

                if (provider == null) {

                AccessibilityNodeInfo root = view.createAccessibilityNodeInfo();

                if (root != null) {

                    if (extraDataRequested != null) {

                        view.addExtraDataToAccessibilityNodeInfo(

                                root, extraDataRequested, arguments);

                    }

                    outInfos.add(root);

                    if ((fetchFlags & AccessibilityNodeInfo.FLAG_PREFETCH_PREDECESSORS) != 0) {

                        prefetchPredecessorsOfRealNode(view, outInfos);

                    }
@@ -1076,16 +1119,7 @@ public final class AccessibilityInteractionController { 
                    if ((fetchFlags & AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS) != 0) {

                        prefetchDescendantsOfRealNode(view, outInfos);

                    }

                }

                } else {

                final AccessibilityNodeInfo root =

                        provider.createAccessibilityNodeInfo(virtualViewId);

                if (root != null) {

                    if (extraDataRequested != null) {

                        provider.addExtraDataToAccessibilityNodeInfo(

                                virtualViewId, root, extraDataRequested, arguments);

                    }

                    outInfos.add(root);

                    if ((fetchFlags & AccessibilityNodeInfo.FLAG_PREFETCH_PREDECESSORS) != 0) {

                        prefetchPredecessorsOfVirtualNode(root, view, provider, outInfos);

                    }
@@ -1096,13 +1130,19 @@ public final class AccessibilityInteractionController { 
                        prefetchDescendantsOfVirtualNode(root, provider, outInfos);

                    }

                }

            }

                if (ENFORCE_NODE_TREE_CONSISTENT) {

                enforceNodeTreeConsistent(outInfos);

                    enforceNodeTreeConsistent(root, outInfos);

                }

            }

        }



        private void enforceNodeTreeConsistent(List<AccessibilityNodeInfo> nodes) {

        private boolean shouldStopPrefetching(List prefetchededInfos) {

            return mHandler.hasUserInteractiveMessagesWaiting()

                    || prefetchededInfos.size() >= MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE;

        }



        private void enforceNodeTreeConsistent(

                AccessibilityNodeInfo root, List<AccessibilityNodeInfo> nodes) {

            LongSparseArray<AccessibilityNodeInfo> nodeMap =

                    new LongSparseArray<AccessibilityNodeInfo>();

            final int nodeCount = nodes.size();
@@ -1113,7 +1153,6 @@ public final class AccessibilityInteractionController { 


            // If the nodes are a tree it does not matter from

            // which node we start to search for the root.

            AccessibilityNodeInfo root = nodeMap.valueAt(0);

            AccessibilityNodeInfo parent = root;

            while (parent != null) {

                root = parent;
@@ -1180,9 +1219,11 @@ public final class AccessibilityInteractionController { 


        private void prefetchPredecessorsOfRealNode(View view,

                List<AccessibilityNodeInfo> outInfos) {

            if (shouldStopPrefetching(outInfos)) {

                return;

            }

            ViewParent parent = view.getParentForAccessibility();

            while (parent instanceof View

                    && outInfos.size() < MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

            while (parent instanceof View && !shouldStopPrefetching(outInfos)) {

                View parentView = (View) parent;

                AccessibilityNodeInfo info = parentView.createAccessibilityNodeInfo();

                if (info != null) {
@@ -1194,6 +1235,9 @@ public final class AccessibilityInteractionController { 


        private void prefetchSiblingsOfRealNode(View current,

                List<AccessibilityNodeInfo> outInfos) {

            if (shouldStopPrefetching(outInfos)) {

                return;

            }

            ViewParent parent = current.getParentForAccessibility();

            if (parent instanceof ViewGroup) {

                ViewGroup parentGroup = (ViewGroup) parent;
@@ -1203,7 +1247,7 @@ public final class AccessibilityInteractionController { 
                    parentGroup.addChildrenForAccessibility(children);

                    final int childCount = children.size();

                    for (int i = 0; i < childCount; i++) {

                        if (outInfos.size() >= MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

                        if (shouldStopPrefetching(outInfos)) {

                            return;

                        }

                        View child = children.get(i);
@@ -1231,7 +1275,7 @@ public final class AccessibilityInteractionController { 


        private void prefetchDescendantsOfRealNode(View root,

                List<AccessibilityNodeInfo> outInfos) {

            if (!(root instanceof ViewGroup)) {

            if (shouldStopPrefetching(outInfos) || !(root instanceof ViewGroup)) {

                return;

            }

            HashMap<View, AccessibilityNodeInfo> addedChildren =
@@ -1242,7 +1286,7 @@ public final class AccessibilityInteractionController { 
                root.addChildrenForAccessibility(children);

                final int childCount = children.size();

                for (int i = 0; i < childCount; i++) {

                    if (outInfos.size() >= MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

                    if (shouldStopPrefetching(outInfos)) {

                        return;

                    }

                    View child = children.get(i);
@@ -1267,7 +1311,7 @@ public final class AccessibilityInteractionController { 
            } finally {

                children.clear();

            }

            if (outInfos.size() < MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

            if (!shouldStopPrefetching(outInfos)) {

                for (Map.Entry<View, AccessibilityNodeInfo> entry : addedChildren.entrySet()) {

                    View addedChild = entry.getKey();

                    AccessibilityNodeInfo virtualRoot = entry.getValue();
@@ -1289,7 +1333,7 @@ public final class AccessibilityInteractionController { 
            long parentNodeId = root.getParentNodeId();

            int accessibilityViewId = AccessibilityNodeInfo.getAccessibilityViewId(parentNodeId);

            while (accessibilityViewId != AccessibilityNodeInfo.UNDEFINED_ITEM_ID) {

                if (outInfos.size() >= MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

                if (shouldStopPrefetching(outInfos)) {

                    return;

                }

                final int virtualDescendantId =
@@ -1334,7 +1378,7 @@ public final class AccessibilityInteractionController { 
                if (parent != null) {

                    final int childCount = parent.getChildCount();

                    for (int i = 0; i < childCount; i++) {

                        if (outInfos.size() >= MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

                        if (shouldStopPrefetching(outInfos)) {

                            return;

                        }

                        final long childNodeId = parent.getChildId(i);
@@ -1359,7 +1403,7 @@ public final class AccessibilityInteractionController { 
            final int initialOutInfosSize = outInfos.size();

            final int childCount = root.getChildCount();

            for (int i = 0; i < childCount; i++) {

                if (outInfos.size() >= MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

                if (shouldStopPrefetching(outInfos)) {

                    return;

                }

                final long childNodeId = root.getChildId(i);
@@ -1369,7 +1413,7 @@ public final class AccessibilityInteractionController { 
                    outInfos.add(child);

                }

            }

            if (outInfos.size() < MAX_ACCESSIBILITY_NODE_INFO_BATCH_SIZE) {

            if (!shouldStopPrefetching(outInfos)) {

                final int addedChildCount = outInfos.size() - initialOutInfosSize;

                for (int i = 0; i < addedChildCount; i++) {

                    AccessibilityNodeInfo child = outInfos.get(initialOutInfosSize + i);
@@ -1478,6 +1522,10 @@ public final class AccessibilityInteractionController { 
        boolean hasAccessibilityCallback(Message message) {

            return message.what < FIRST_NO_ACCESSIBILITY_CALLBACK_MSG ? true : false;

        }



        boolean hasUserInteractiveMessagesWaiting() {

            return hasMessagesOrCallbacks();

        }

    }



    private final class AddNodeInfosForViewId implements Predicate<View> {

core/java/android/view/accessibility/AccessibilityInteractionClient.java

+47 −9

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl

+9 −0
Original line number Diff line number Diff line
@@ -46,6 +46,15 @@ oneway interface IAccessibilityInteractionConnectionCallback { 
    void setFindAccessibilityNodeInfosResult(in List<AccessibilityNodeInfo> infos,

        int interactionId);



    /**

     * Sets the result of a prefetch request that returns {@link AccessibilityNodeInfo}s.

     *

     * @param root The {@link AccessibilityNodeInfo} for which the prefetching is based off of.

     * @param infos The result {@link AccessibilityNodeInfo}s.

     */

    void setPrefetchAccessibilityNodeInfoResult(

        in List<AccessibilityNodeInfo> infos, int interactionId);



    /**

     * Sets the result of a request to perform an accessibility action.

     *

core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java

+3 −6
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.Mock;



import java.util.Arrays;

import java.util.List;



/**

 * Tests for AccessibilityInteractionClient

 */
@@ -65,7 +62,7 @@ public class AccessibilityInteractionClientTest { 
        final long accessibilityNodeId = 0x4321L;

        AccessibilityNodeInfo nodeFromConnection = AccessibilityNodeInfo.obtain();

        nodeFromConnection.setSourceNodeId(accessibilityNodeId, windowId);

        mMockConnection.mInfosToReturn = Arrays.asList(nodeFromConnection);

        mMockConnection.mInfoToReturn = nodeFromConnection;

        AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance();

        AccessibilityNodeInfo node = client.findAccessibilityNodeInfoByAccessibilityId(

                MOCK_CONNECTION_ID, windowId, accessibilityNodeId, true, 0, null);
@@ -75,7 +72,7 @@ public class AccessibilityInteractionClientTest { 
    }



    private static class MockConnection extends AccessibilityServiceConnectionImpl {

        List<AccessibilityNodeInfo> mInfosToReturn;

        AccessibilityNodeInfo mInfoToReturn;



        @Override

        public String[] findAccessibilityNodeInfoByAccessibilityId(int accessibilityWindowId,
@@ -83,7 +80,7 @@ public class AccessibilityInteractionClientTest { 
                IAccessibilityInteractionConnectionCallback callback, int flags, long threadId,

                Bundle arguments) {

            try {

                callback.setFindAccessibilityNodeInfosResult(mInfosToReturn, interactionId);

                callback.setFindAccessibilityNodeInfoResult(mInfoToReturn, interactionId);

            } catch (RemoteException e) {

                throw new RuntimeException(e);

            }

services/accessibility/java/com/android/server/accessibility/ActionReplacingCallback.java

+96 −89

File changed.

Preview size limit exceeded, changes collapsed.