Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" am: 14c7e67da8

Browse Source 
am: 6006d681ab

Change-Id: I9ed4aca6b9d23a4e8196bdb9595c5e1b8fd2faf4
This commit is contained in:
Svetoslav Ganov
2017-03-14 19:12:23 +00:00
committed by android-build-merger
parent b81a0cb340 6006d681ab
commit 5cd3bb93ce
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -398,12 +398,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0)); removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));
} else if (Intent.ACTION_USER_PRESENT.equals(action)) { } else if (Intent.ACTION_USER_PRESENT.equals(action)) {
// We will update when the automation service dies. // We will update when the automation service dies.
synchronized (mLock) {
UserState userState = getCurrentUserStateLocked(); UserState userState = getCurrentUserStateLocked();
if (!userState.isUiAutomationSuppressingOtherServices()) { if (!userState.isUiAutomationSuppressingOtherServices()) {
if (readConfigurationForUserStateLocked(userState)) { if (readConfigurationForUserStateLocked(userState)) {
onUserStateChangedLocked(userState); onUserStateChangedLocked(userState);
} }
} }
}
} else if (Intent.ACTION_SETTING_RESTORED.equals(action)) { } else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {
final String which = intent.getStringExtra(Intent.EXTRA_SETTING_NAME); final String which = intent.getStringExtra(Intent.EXTRA_SETTING_NAME);
if (Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES.equals(which)) { if (Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES.equals(which)) {