Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AccessibilityManager returning duplicate services" into oc-dev

Browse Source
This commit is contained in:
Casey Burkhardt
2017-04-04 04:29:21 +00:00
committed by Android (Google) Code Review
parent d2778f32e2 0dd5b944ef
commit 3bf7c7634a
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -585,17 +585,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
result = mEnabledServicesForFeedbackTempList;
result.clear();
List<Service> services = userState.mBoundServices;
while (feedbackType != 0) {
final int feedbackTypeBit = (1 << Integer.numberOfTrailingZeros(feedbackType));
feedbackType &= ~feedbackTypeBit;
final int serviceCount = services.size();
for (int i = 0; i < serviceCount; i++) {
Service service = services.get(i);
// Don't report the UIAutomation (fake service)
if (!sFakeAccessibilityServiceComponentName.equals(service.mComponentName)
&& (service.mFeedbackType & feedbackTypeBit) != 0) {
result.add(service.mAccessibilityServiceInfo);
}
for (int serviceCount = services.size(), i = 0; i < serviceCount; ++i) {
Service service = services.get(i);
// Don't report the UIAutomation (fake service)
if (!sFakeAccessibilityServiceComponentName.equals(service.mComponentName)
&& (service.mFeedbackType & feedbackType) != 0) {
result.add(service.mAccessibilityServiceInfo);
}
}
}