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

Merge "Fix concurrent modify exception for A11y" am: 2dcd402cdc am: 0b6b68b0ae

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d891d8abc612df1fa2003ad946b98b9d22088aa
This commit is contained in:
Phil Weaver
2021-02-23 23:39:56 +00:00
committed by Automerger Merge Worker
parent 14730f0311 0b6b68b0ae
commit 6881bf4a6e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,6 +766,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
// performs the current profile parent resolution. // performs the current profile parent resolution.
final int resolvedUserId = mSecurityPolicy final int resolvedUserId = mSecurityPolicy
.resolveCallingUserIdEnforcingPermissionsLocked(userId); .resolveCallingUserIdEnforcingPermissionsLocked(userId);
if (Binder.getCallingPid() == OWN_PROCESS_ID) {
return new ArrayList<>(getUserStateLocked(resolvedUserId).mInstalledServices);
}
return getUserStateLocked(resolvedUserId).mInstalledServices; return getUserStateLocked(resolvedUserId).mInstalledServices;
} }
} }