Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab56e69 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am:... 

Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed16 am: 7588fa68 am: 10c659e3 am: 73089d0c am: 18628f19

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



Change-Id: I4522a505a4580df1c5ebf25dd976f525e2ee10a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2dc68a9d 18628f19

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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());

                }

            }