diff options
| author | Phil Weaver <pweaver@google.com> | 2021-02-23 23:28:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 23:28:16 +0000 |
| commit | 0b6b68b0ae23d8195dd9e6f978b726c3375bbfd6 (patch) | |
| tree | 76c414578cc503c919101a8972fd331b437f1476 | |
| parent | ac38baefa01b50616e1b8857a842f78a363981c9 (diff) | |
| parent | 2dcd402cdc7806d0dffc14971b64c3e7f05b64af (diff) | |
Merge "Fix concurrent modify exception for A11y" am: 2dcd402cdc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie98305d5930ee7426bb8169d8f4a70d76e5383f6
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 9c10bad1775a..a4bd58d3615a 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -766,6 +766,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked(userId); + + if (Binder.getCallingPid() == OWN_PROCESS_ID) { + return new ArrayList<>(getUserStateLocked(resolvedUserId).mInstalledServices); + } return getUserStateLocked(resolvedUserId).mInstalledServices; } } |