Merge "Service requests can interrupt node prefetching" into sc-dev (515057f7) · Commits · e / os / android_frameworks_base

core/java/android/view/AccessibilityInteractionController.java

+221 −130

Original line number	Diff line number	Diff line
		@@ -86,6 +86,12 @@ public final class AccessibilityInteractionController {
		// accessibility from hanging
		private static final long REQUEST_PREPARER_TIMEOUT_MS = 500;

		// Callbacks should have the same configuration of the flags below to allow satisfying a pending
		// node request on prefetch
		private static final int FLAGS_AFFECTING_REPORTED_DATA =
		AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS
		\| AccessibilityNodeInfo.FLAG_REPORT_VIEW_IDS;

		private final ArrayList<AccessibilityNodeInfo> mTempAccessibilityNodeInfoList =
		new ArrayList<AccessibilityNodeInfo>();

		@@ -113,6 +119,9 @@ public final class AccessibilityInteractionController {

		private AddNodeInfosForViewId mAddNodeInfosForViewId;

		@GuardedBy("mLock")
		private ArrayList<Message> mPendingFindNodeByIdMessages;

		@GuardedBy("mLock")
		private int mNumActiveRequestPreparers;
		@GuardedBy("mLock")
		@@ -128,6 +137,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,7 +187,11 @@ public final class AccessibilityInteractionController {
		args.arg4 = arguments;
		message.obj = args;

		scheduleMessage(message, interrogatingPid, interrogatingTid, CONSIDER_REQUEST_PREPARERS);
		synchronized (mLock) {
		mPendingFindNodeByIdMessages.add(message);
		scheduleMessage(message, interrogatingPid, interrogatingTid,
		CONSIDER_REQUEST_PREPARERS);
		}
		}

		/**
		@@ -315,6 +329,9 @@ public final class AccessibilityInteractionController {
		}

		private void findAccessibilityNodeInfoByAccessibilityIdUiThread(Message message) {
		synchronized (mLock) {
		mPendingFindNodeByIdMessages.remove(message);
		}
		final int flags = message.arg1;

		SomeArgs args = (SomeArgs) message.obj;
		@@ -329,22 +346,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);
		}
		ArrayList<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(rootNode, infos, flags);
		}

		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,
		@@ -403,6 +456,7 @@ public final class AccessibilityInteractionController {
		mAddNodeInfosForViewId.reset();
		}
		} finally {
		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;
		updateInfosForViewportAndReturnFindNodeResult(
		infos, callback, interactionId, spec, interactiveRegion);
		}
		@@ -485,6 +539,7 @@ public final class AccessibilityInteractionController {
		}
		}
		} finally {
		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;
		updateInfosForViewportAndReturnFindNodeResult(
		infos, callback, interactionId, spec, interactiveRegion);
		}
		@@ -576,6 +631,7 @@ public final class AccessibilityInteractionController {
		}
		}
		} finally {
		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;
		updateInfoForViewportAndReturnFindNodeResult(
		focused, callback, interactionId, spec, interactiveRegion);
		}
		@@ -630,6 +686,7 @@ public final class AccessibilityInteractionController {
		}
		}
		} finally {
		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = 0;
		updateInfoForViewportAndReturnFindNodeResult(
		next, callback, interactionId, spec, interactiveRegion);
		}
		@@ -786,33 +843,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) {
		@@ -833,17 +863,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;
		@@ -891,17 +910,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;
		@@ -975,18 +983,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();
		@@ -996,24 +1032,82 @@ public final class AccessibilityInteractionController {
		}
		}

		private void updateInfoForViewportAndReturnFindNodeResult(AccessibilityNodeInfo info,
		IAccessibilityInteractionConnectionCallback callback, int interactionId,
		MagnificationSpec spec, Region interactiveRegion) {
		private void returnPendingFindAccessibilityNodeInfosInPrefetch(AccessibilityNodeInfo rootNode,
		List<AccessibilityNodeInfo> infos, int flags) {

		AccessibilityNodeInfo satisfiedPendingRequestPrefetchedNode = null;
		IAccessibilityInteractionConnectionCallback satisfiedPendingRequestCallback = null;
		int satisfiedPendingRequestInteractionId = AccessibilityInteractionClient.NO_ID;

		synchronized (mLock) {
		for (int i = 0; i < mPendingFindNodeByIdMessages.size(); i++) {
		final Message pendingMessage = mPendingFindNodeByIdMessages.get(i);
		final int pendingFlags = pendingMessage.arg1;
		if ((pendingFlags & FLAGS_AFFECTING_REPORTED_DATA)
		!= (flags & FLAGS_AFFECTING_REPORTED_DATA)) {
		continue;
		}
		SomeArgs args = (SomeArgs) pendingMessage.obj;
		final int accessibilityViewId = args.argi1;
		final int virtualDescendantId = args.argi2;

		satisfiedPendingRequestPrefetchedNode = nodeWithIdFromList(rootNode,
		infos, AccessibilityNodeInfo.makeNodeId(
		accessibilityViewId, virtualDescendantId));

		if (satisfiedPendingRequestPrefetchedNode != null) {
		satisfiedPendingRequestCallback =
		(IAccessibilityInteractionConnectionCallback) args.arg1;
		satisfiedPendingRequestInteractionId = args.argi3;
		mHandler.removeMessages(
		PrivateHandler.MSG_FIND_ACCESSIBILITY_NODE_INFO_BY_ACCESSIBILITY_ID,
		pendingMessage.obj);
		args.recycle();
		break;
		}
		}
		mPendingFindNodeByIdMessages.clear();
		}

		if (satisfiedPendingRequestPrefetchedNode != null) {
		returnFindNodeResult(
		AccessibilityNodeInfo.obtain(satisfiedPendingRequestPrefetchedNode),
		satisfiedPendingRequestCallback, satisfiedPendingRequestInteractionId);
		}
		}

		private AccessibilityNodeInfo nodeWithIdFromList(AccessibilityNodeInfo rootNode,
		List<AccessibilityNodeInfo> infos, long nodeId) {
		if (rootNode != null && rootNode.getSourceNodeId() == nodeId) {
		return rootNode;
		}
		for (int j = 0; j < infos.size(); j++) {
		AccessibilityNodeInfo info = infos.get(j);
		if (info.getSourceNodeId() == nodeId) {
		return info;
		}
		}
		return null;
		}

		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(
		View view, int virtualDescendantId, Bundle arguments) {
		Parcelable span = arguments.getParcelable(ACTION_ARGUMENT_ACCESSIBLE_CLICKABLE_SPAN);
		@@ -1054,20 +1148,13 @@ 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) {
		return;
		}
		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);
		}
		@@ -1077,16 +1164,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);
		}
		@@ -1097,13 +1175,18 @@ 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();
		@@ -1114,7 +1197,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;
		@@ -1181,9 +1263,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) {
		@@ -1195,6 +1279,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;
		@@ -1204,7 +1291,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);
		@@ -1232,7 +1319,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 =
		@@ -1243,7 +1330,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);
		@@ -1268,7 +1355,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();
		@@ -1290,7 +1377,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 =
		@@ -1335,7 +1422,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);
		@@ -1360,7 +1447,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);
		@@ -1370,7 +1457,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);
		@@ -1479,6 +1566,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

+84 −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

File changed.

Preview size limit exceeded, changes collapsed.

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

+128 −93

File changed.

Preview size limit exceeded, changes collapsed.