From 4496d8d5c3c83f3c267b2521f6444af1ac940e71 Mon Sep 17 00:00:00 2001
From: sallyyuen <sallyyuen@google.com>
Date: Thu, 25 Aug 2022 09:36:41 -0700
Subject: [PATCH] [EXO] Add aidl methods to set installed and enabled a11y
 services

This will simplify the management of active a11y services when dealing
with proxies.

Test: builds
Bug: 241429275

Change-Id: I6785b9bea218946e95941453d637198bb0230a78
---
 .../IAccessibilityServiceConnection.aidl              |  4 ++++
 .../AccessibilityServiceConnectionImpl.java           | 11 +++++++++++
 .../AbstractAccessibilityServiceConnection.java       | 10 ++++++++++
 3 files changed, 25 insertions(+)

diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
index 0d6b19941afed..9abce3a399441 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
@@ -146,4 +146,8 @@ interface IAccessibilityServiceConnection {
     void onDoubleTapAndHold(int displayId);
 
     void setAnimationScale(float scale);
+
+    void setInstalledAndEnabledServices(in List<AccessibilityServiceInfo> infos);
+
+    List<AccessibilityServiceInfo> getInstalledAndEnabledServices();
 }
diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java
index fc385a013d007..35d5948bc2af6 100644
--- a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java
+++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java
@@ -26,6 +26,7 @@ import android.graphics.Region;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteCallback;
+import android.os.RemoteException;
 
 import java.util.Collections;
 import java.util.List;
@@ -206,4 +207,14 @@ public class AccessibilityServiceConnectionImpl extends IAccessibilityServiceCon
             int processId, long threadId, int callingUid, Bundle serializedCallingStackInBundle) {}
 
     public void setAnimationScale(float scale) {}
+
+    @Override
+    public void setInstalledAndEnabledServices(List<AccessibilityServiceInfo> infos)
+            throws RemoteException {
+    }
+
+    @Override
+    public List<AccessibilityServiceInfo> getInstalledAndEnabledServices() throws RemoteException {
+        return null;
+    }
 }
diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
index 799c759b96d28..1df382fbd76f5 100644
--- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
@@ -463,6 +463,16 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
         }
     }
 
+    @Override
+    public void setInstalledAndEnabledServices(List<AccessibilityServiceInfo> infos) {
+        return;
+    }
+
+    @Override
+    public List<AccessibilityServiceInfo> getInstalledAndEnabledServices() {
+        return null;
+    }
+
     @Override
     public void setAttributionTag(String attributionTag) {
         mAttributionTag = attributionTag;