From 8f22ff722ee4dc110f39c4815af9c44b6e5e588d Mon Sep 17 00:00:00 2001
From: liulvping <liulvping@xiaomi.com>
Date: Sun, 7 Feb 2021 13:52:51 +0800
Subject: [PATCH] Fix concurrent modify exception for A11y

Bug: 180524510
Test: manual test

Change-Id: I9f0087c99872633f27a7e5b8355087d03ea2cb00
Signed-off-by: liulvping <liulvping@xiaomi.com>
---
 .../server/accessibility/AccessibilityManagerService.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index fcf270b4ef356..ac2ce5c75269b 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;
         }
     }