Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I9f9dca5eccac9bc82357e1322b3d3534a86e6ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Norman
2022-09-19 19:21:10 +00:00
committed by Automerger Merge Worker

View File

@@ -791,7 +791,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
final List<AccessibilityServiceInfo> result = new ArrayList<>(serviceCount); final List<AccessibilityServiceInfo> result = new ArrayList<>(serviceCount);
for (int i = 0; i < serviceCount; ++i) { for (int i = 0; i < serviceCount; ++i) {
final AccessibilityServiceConnection service = services.get(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()); result.add(service.getServiceInfo());
} }
} }