diff --git a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
index 6a7aad354d8f7..9e893da02c700 100644
--- a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
+++ b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
@@ -349,7 +349,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
         }
     }
 
-    private void disableFeatures() {
+    void disableFeatures() {
         if (mTouchExplorer != null) {
             mTouchExplorer.clear();
             mTouchExplorer.onDestroy();
diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index d51f48f1da8e1..138c51b8898cb 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -797,6 +797,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
     private Service getQueryBridge() {
         if (mQueryBridge == null) {
             AccessibilityServiceInfo info = new AccessibilityServiceInfo();
+            info.setCapabilities(AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT);
             mQueryBridge = new Service(UserHandle.USER_NULL,
                     sFakeAccessibilityServiceComponentName, info);
         }