Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initialize DirectA11yConnection pid in constructor, not static." into udc-dev

Browse Source
This commit is contained in:
Daniel Norman
2023-02-23 19:33:19 +00:00
committed by Android (Google) Code Review
parent c2a7bf8ba3 33d7e37880
commit 5a2edd43f7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/view/accessibility/DirectAccessibilityConnection.java
View File

@@ -50,13 +50,13 @@ import android.os.RemoteException;
class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Default { class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Default {
private final IAccessibilityInteractionConnection mAccessibilityInteractionConnection; private final IAccessibilityInteractionConnection mAccessibilityInteractionConnection;
private final AccessibilityManager mAccessibilityManager; private final AccessibilityManager mAccessibilityManager;
private final int mMyProcessId;
// Fetch all views, but do not use prefetching/cache since this "connection" does not // Fetch all views, but do not use prefetching/cache since this "connection" does not
// receive cache invalidation events (as it is not linked to an AccessibilityService). // receive cache invalidation events (as it is not linked to an AccessibilityService).
private static final int FETCH_FLAGS = private static final int FETCH_FLAGS =
AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS
| AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_INCLUDE_NOT_IMPORTANT_VIEWS; | AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_INCLUDE_NOT_IMPORTANT_VIEWS;
private static final int PID = Process.myPid();
private static final Region INTERACTIVE_REGION = null; private static final Region INTERACTIVE_REGION = null;
DirectAccessibilityConnection( DirectAccessibilityConnection(
@@ -64,6 +64,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
AccessibilityManager accessibilityManager) { AccessibilityManager accessibilityManager) {
mAccessibilityInteractionConnection = accessibilityInteractionConnection; mAccessibilityInteractionConnection = accessibilityInteractionConnection;
mAccessibilityManager = accessibilityManager; mAccessibilityManager = accessibilityManager;
mMyProcessId = Process.myPid();
} }
@Override @Override
@@ -74,8 +75,9 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
IAccessibilityManager.WindowTransformationSpec spec = IAccessibilityManager.WindowTransformationSpec spec =
mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId); mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);
mAccessibilityInteractionConnection.findAccessibilityNodeInfoByAccessibilityId( mAccessibilityInteractionConnection.findAccessibilityNodeInfoByAccessibilityId(
accessibilityNodeId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, accessibilityNodeId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS,
threadId, spec.magnificationSpec, spec.transformationMatrix, arguments); mMyProcessId, threadId, spec.magnificationSpec, spec.transformationMatrix,
arguments);
return new String[0]; return new String[0];
} }
@@ -87,8 +89,8 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
IAccessibilityManager.WindowTransformationSpec spec = IAccessibilityManager.WindowTransformationSpec spec =
mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId); mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);
mAccessibilityInteractionConnection.findAccessibilityNodeInfosByText(accessibilityNodeId, mAccessibilityInteractionConnection.findAccessibilityNodeInfosByText(accessibilityNodeId,
text, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId, text, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId,
spec.magnificationSpec, spec.transformationMatrix); threadId, spec.magnificationSpec, spec.transformationMatrix);
return new String[0]; return new String[0];
} }
@@ -100,8 +102,8 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
IAccessibilityManager.WindowTransformationSpec spec = IAccessibilityManager.WindowTransformationSpec spec =
mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId); mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);
mAccessibilityInteractionConnection.findAccessibilityNodeInfosByViewId(accessibilityNodeId, mAccessibilityInteractionConnection.findAccessibilityNodeInfosByViewId(accessibilityNodeId,
viewId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId, viewId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId,
spec.magnificationSpec, spec.transformationMatrix); threadId, spec.magnificationSpec, spec.transformationMatrix);
return new String[0]; return new String[0];
} }
@@ -112,7 +114,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
IAccessibilityManager.WindowTransformationSpec spec = IAccessibilityManager.WindowTransformationSpec spec =
mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId); mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);
mAccessibilityInteractionConnection.findFocus(accessibilityNodeId, focusType, mAccessibilityInteractionConnection.findFocus(accessibilityNodeId, focusType,
INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId, threadId,
spec.magnificationSpec, spec.transformationMatrix); spec.magnificationSpec, spec.transformationMatrix);
return new String[0]; return new String[0];
} }
@@ -124,7 +126,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
IAccessibilityManager.WindowTransformationSpec spec = IAccessibilityManager.WindowTransformationSpec spec =
mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId); mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);
mAccessibilityInteractionConnection.focusSearch(accessibilityNodeId, direction, mAccessibilityInteractionConnection.focusSearch(accessibilityNodeId, direction,
INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId, threadId,
spec.magnificationSpec, spec.transformationMatrix); spec.magnificationSpec, spec.transformationMatrix);
return new String[0]; return new String[0];
} }
@@ -135,7 +137,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa
IAccessibilityInteractionConnectionCallback callback, long threadId) IAccessibilityInteractionConnectionCallback callback, long threadId)
throws RemoteException { throws RemoteException {
mAccessibilityInteractionConnection.performAccessibilityAction(accessibilityNodeId, action, mAccessibilityInteractionConnection.performAccessibilityAction(accessibilityNodeId, action,
arguments, interactionId, callback, FETCH_FLAGS, PID, threadId); arguments, interactionId, callback, FETCH_FLAGS, mMyProcessId, threadId);
return true; return true;
} }
} }