Merge "[EXO] Add aidl methods to set installed and enabled a11y services"

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();
 }

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;
+    }
 }

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;