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

Merge "Filter a11y events by display id for AccessibilityDisplayProxy"

Browse Source
This commit is contained in:
Sally Yuen
2022-12-14 02:17:22 +00:00
committed by Android (Google) Code Review
parent bd39912383 008aa6cf07
commit 3001d9d531
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/accessibility/AccessibilityDisplayProxy.java
View File

@@ -242,11 +242,7 @@ public abstract class AccessibilityDisplayProxy {
super(context, executor, new AccessibilityService.Callbacks() {
@Override
public void onAccessibilityEvent(AccessibilityEvent event) {
// TODO(254545943): Remove check when event processing is done more upstream in
// AccessibilityManagerService.
if (event.getDisplayId() == mDisplayId) {
AccessibilityDisplayProxy.this.onAccessibilityEvent(event);
}
AccessibilityDisplayProxy.this.onAccessibilityEvent(event);
}
@Override

15
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -1018,10 +1018,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
private void dispatchAccessibilityEventLocked(AccessibilityEvent event) {
notifyAccessibilityServicesDelayedLocked(event, false);
notifyAccessibilityServicesDelayedLocked(event, true);
if (mProxyManager.isProxyed(event.getDisplayId())) {
mProxyManager.sendAccessibilityEventLocked(event);
} else {
notifyAccessibilityServicesDelayedLocked(event, false);
notifyAccessibilityServicesDelayedLocked(event, true);
}
mUiAutomationManager.sendAccessibilityEventLocked(event);
mProxyManager.sendAccessibilityEvent(event);
}
private void sendAccessibilityEventToInputFilter(AccessibilityEvent event) {
@@ -1162,7 +1165,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
List<AccessibilityServiceConnection> services =
getUserStateLocked(resolvedUserId).mBoundServices;
int numServices = services.size() + mProxyManager.getNumProxys();
int numServices = services.size() + mProxyManager.getNumProxysLocked();
interfacesToInterrupt = new ArrayList<>(numServices);
for (int i = 0; i < services.size(); i++) {
AccessibilityServiceConnection service = services.get(i);
@@ -1172,7 +1175,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
interfacesToInterrupt.add(a11yServiceInterface);
}
}
mProxyManager.addServiceInterfaces(interfacesToInterrupt);
mProxyManager.addServiceInterfacesLocked(interfacesToInterrupt);
}
for (int i = 0, count = interfacesToInterrupt.size(); i < count; i++) {
try {
@@ -1963,7 +1966,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
mUiAutomationManager.getServiceInfo(), client)
? mUiAutomationManager.getRelevantEventTypes()
: 0;
relevantEventTypes |= mProxyManager.getRelevantEventTypes();
relevantEventTypes |= mProxyManager.getRelevantEventTypesLocked();
return relevantEventTypes;
}

35
services/accessibility/java/com/android/server/accessibility/ProxyManager.java
View File

@@ -37,6 +37,7 @@ import java.util.List;
* proxy connection will belong to a separate user state.
*
* TODO(241117292): Remove or cut down during simultaneous user refactoring.
* TODO(262244375): Add unit tests.
*/
public class ProxyManager {
// Names used to populate ComponentName and ResolveInfo in connection.mA11yServiceInfo and in
@@ -84,7 +85,9 @@ public class ProxyManager {
windowManagerInternal,
awm, displayId);
mProxyA11yServiceConnections.put(displayId, connection);
synchronized (mLock) {
mProxyA11yServiceConnections.put(displayId, connection);
}
// If the client dies, make sure to remove the connection.
IBinder.DeathRecipient deathRecipient =
@@ -98,7 +101,9 @@ public class ProxyManager {
client.asBinder().linkToDeath(deathRecipient, 0);
// Notify apps that the service state has changed.
// A11yManager#A11yServicesStateChangeListener
connection.mSystemSupport.onClientChangeLocked(true);
synchronized (mLock) {
connection.mSystemSupport.onClientChangeLocked(true);
}
connection.initializeServiceInterface(client);
}
@@ -111,9 +116,11 @@ public class ProxyManager {
}
private boolean clearConnection(int displayId) {
if (mProxyA11yServiceConnections.contains(displayId)) {
mProxyA11yServiceConnections.remove(displayId);
return true;
synchronized (mLock) {
if (mProxyA11yServiceConnections.contains(displayId)) {
mProxyA11yServiceConnections.remove(displayId);
return true;
}
}
return false;
}
@@ -122,7 +129,9 @@ public class ProxyManager {
* Checks if a display id is being proxy-ed.
*/
public boolean isProxyed(int displayId) {
return mProxyA11yServiceConnections.contains(displayId);
synchronized (mLock) {
return mProxyA11yServiceConnections.contains(displayId);
}
}
/**
@@ -130,10 +139,10 @@ public class ProxyManager {
* {@link android.view.accessibility.AccessibilityDisplayProxy} will filter based on display.
* TODO(b/250929565): Filtering should happen in the system, not in the proxy.
*/
public void sendAccessibilityEvent(AccessibilityEvent event) {
for (int i = 0; i < mProxyA11yServiceConnections.size(); i++) {
ProxyAccessibilityServiceConnection proxy =
mProxyA11yServiceConnections.valueAt(i);
public void sendAccessibilityEventLocked(AccessibilityEvent event) {
final ProxyAccessibilityServiceConnection proxy =
mProxyA11yServiceConnections.get(event.getDisplayId());
if (proxy != null) {
proxy.notifyAccessibilityEvent(event);
}
}
@@ -187,7 +196,7 @@ public class ProxyManager {
* Returns the relevant event types of every proxy.
* TODO(254545943): When A11yManager is separated, return based on the A11yManager display.
*/
public int getRelevantEventTypes() {
public int getRelevantEventTypesLocked() {
int relevantEventTypes = 0;
for (int i = 0; i < mProxyA11yServiceConnections.size(); i++) {
ProxyAccessibilityServiceConnection proxy =
@@ -201,7 +210,7 @@ public class ProxyManager {
* Gets the number of current proxy connections.
* @return
*/
public int getNumProxys() {
public int getNumProxysLocked() {
return mProxyA11yServiceConnections.size();
}
@@ -209,7 +218,7 @@ public class ProxyManager {
* Adds the service interfaces to a list.
* @param interfaces
*/
public void addServiceInterfaces(List<IAccessibilityServiceClient> interfaces) {
public void addServiceInterfacesLocked(List<IAccessibilityServiceClient> interfaces) {
for (int i = 0; i < mProxyA11yServiceConnections.size(); i++) {
final ProxyAccessibilityServiceConnection proxy =
mProxyA11yServiceConnections.valueAt(i);