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

Merge "Prevent race condition when iterating over bound services"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-13 02:32:04 +00:00
committed by Android (Google) Code Review
parent aa8be75854 5b05f77a12
commit 34bc2ab967
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1362,14 +1362,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
private int computeRelevantEventTypes(UserState userState, Client client) {
int relevantEventTypes = 0;
int numBoundServices = userState.mBoundServices.size();
for (int i = 0; i < numBoundServices; i++) {
AccessibilityServiceConnection service =
userState.mBoundServices.get(i);
// Use iterator for thread-safety
for (AccessibilityServiceConnection service : userState.mBoundServices) {
relevantEventTypes |= isClientInPackageWhitelist(service.getServiceInfo(), client)
? service.getRelevantEventTypes()
: 0;
}
relevantEventTypes |= isClientInPackageWhitelist(
mUiAutomationManager.getServiceInfo(), client)
? mUiAutomationManager.getRelevantEventTypes()