summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Norman <danielnorman@google.com>2022-09-15 16:43:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-09-15 16:43:41 +0000
commit6505ed1695a1509e7e16dc5898924adcb3e422c5 (patch)
tree4f5647f9d2e8fc31f48f26e001e3761724b68d9e
parentc184d7b7217b9632169964da81ed11edff08b72f (diff)
parent2bc4d49c2b0265f5de1c62d1342b1426cc5e1377 (diff)
downloadbase-6505ed1695a1509e7e16dc5898924adcb3e422c5.tar.gz
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev
-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 05b937a34626..3ca6bf421fae 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -670,7 +670,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());
}
}