summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author liulvping <liulvping@xiaomi.com> 2021-02-07 13:52:51 +0800
committer liulvping <liulvping@xiaomi.com> 2021-02-18 12:39:32 +0800
commit8f22ff722ee4dc110f39c4815af9c44b6e5e588d (patch)
treee389f1569846f1ea8207a2f962e556a958a04cfe
parent6bc7032b854bdec4d50b070a6f158539b63fce37 (diff)
Fix concurrent modify exception for A11y
Bug: 180524510 Test: manual test Change-Id: I9f0087c99872633f27a7e5b8355087d03ea2cb00 Signed-off-by: liulvping <liulvping@xiaomi.com>
-rw-r--r--services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java4
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 fcf270b4ef35..ac2ce5c75269 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;
}
}