summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Norman <danielnorman@google.com>2022-09-01 10:14:24 -0700
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-10-19 16:39:05 +0000
commit38723c7b8ad977a56d53bb85a4ef8af60a29a62c (patch)
tree7b0598ce10d75827ef0292a3f3269d1758f0a47a
parentb0080f1242fd3288d5c9c375cc51dad3d88f8751 (diff)
downloadbase-38723c7b8ad977a56d53bb85a4ef8af60a29a62c.tar.gz
Include all enabled services when FEEDBACK_ALL_MASK.
Bug: 243849844 Test: m sts; sts-tradefed run sts-dynamic-develop -m CtsAccessibilityTestCases Change-Id: I4f93e06d1066085bd64e8f09882de2f4a72a0633 (cherry picked from commit 2bc4d49c2b0265f5de1c62d1342b1426cc5e1377) Merged-In: I4f93e06d1066085bd64e8f09882de2f4a72a0633
-rw-r--r--services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index f63198866b08..1a742ff9f322 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -926,7 +926,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
final List<AccessibilityServiceInfo> result = new ArrayList<>(serviceCount);
for (int i = 0; i < serviceCount; ++i) {
final AccessibilityServiceConnection service = services.get(i);
- if ((service.mFeedbackType & feedbackType) != 0) {
+ if ((service.mFeedbackType & feedbackType) != 0
+ || feedbackType == AccessibilityServiceInfo.FEEDBACK_ALL_MASK) {
result.add(service.getServiceInfo());
}
}