commit 00de0e644dad9c70f0ed87e9028a14328b08b949
author Svetoslav Ganov <svetoslavganov@google.com> Tue Mar 14 19:18:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 14 19:18:26 2017 +0000
tree e5aaa00bb65785a01ee27982f1cdc90ab7b218b3
parent 64e93531b0b2db10a581e30d6e7e758d98950151
parent 5cd3bb93ce6b63dbe9f19d7ad45be2a87904762c

Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" am: 14c7e67da8 am: 6006d681ab
am: 5cd3bb93ce

Change-Id: Iee29739716cd7a264196d0999ada7d4399b30a3e

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

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index b56035f..98ce00e 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -416,10 +416,12 @@
                     removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));
                 } else if (Intent.ACTION_USER_PRESENT.equals(action)) {
                     // We will update when the automation service dies.
-                    UserState userState = getCurrentUserStateLocked();
-                    if (!userState.isUiAutomationSuppressingOtherServices()) {
-                        if (readConfigurationForUserStateLocked(userState)) {
-                            onUserStateChangedLocked(userState);
+                    synchronized (mLock) {
+                        UserState userState = getCurrentUserStateLocked();
+                        if (!userState.isUiAutomationSuppressingOtherServices()) {
+                            if (readConfigurationForUserStateLocked(userState)) {
+                                onUserStateChangedLocked(userState);
+                            }
                         }
                     }
                 } else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {