diff options
| author | 2022-09-19 20:17:29 +0000 | |
|---|---|---|
| committer | 2022-09-19 20:17:29 +0000 | |
| commit | 7ab56e694085b3c8ada14aa2a4e5bce4846f71fd (patch) | |
| tree | ee22ae9b41a4ab966c893f6afd29d98d83e66e57 | |
| parent | 2dc68a9db2948fd8adeefac0ad4deb2a03ae48d2 (diff) | |
| parent | 18628f192fb59512e2140d9f048ee4b9028a4ccb (diff) | |
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: I4522a505a4580df1c5ebf25dd976f525e2ee10a6
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 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()); } } |