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

Commit 0b6b68b0 authored by Phil Weaver's avatar Phil Weaver Committed by Automerger Merge Worker
Browse files

Merge "Fix concurrent modify exception for A11y" am: 2dcd402c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie98305d5930ee7426bb8169d8f4a70d76e5383f6
parents ac38baef 2dcd402c

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

+4 −0
Original line number Diff line number Diff line
@@ -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;

        }

    }