diff options
| author | 2022-09-19 18:43:22 +0000 | |
|---|---|---|
| committer | 2022-09-19 18:43:22 +0000 | |
| commit | 10c659e317c56a33afb4ed8900c34cf47d3ad15e (patch) | |
| tree | 41a5ad649e19607448562949e19cf09d770165e8 | |
| parent | 5ddcc96b01576b6e05e4d9225d46a79671563c70 (diff) | |
| parent | 7588fa68660be986abf983eddfe2beb6d7db5085 (diff) | |
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: I7e0febed51091e07af6be4157d081c837a719589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java | 3 |
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 499a2711d8e6..e095e9e8d0c0 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -791,7 +791,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()); } } |