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

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

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

Merge "Fix concurrent modify exception for A11y" am: 2dcd402c am: 0b6b68b0 am: 6881bf4a am: c7c7cadb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40652e87ef80cd64c2a2c65de8aa461cb9e5d9d5
parents 7bbaaaeb c7c7cadb

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

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

        }

    }