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

Commit 14c7e67d authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Gerrit Code Review
Browse files

Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"

parents 5df03b3d 4606a4ae

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

+6 −4
Original line number Diff line number Diff line
@@ -398,12 +398,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                    removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));

                } else if (Intent.ACTION_USER_PRESENT.equals(action)) {

                    // We will update when the automation service dies.

                    synchronized (mLock) {

                        UserState userState = getCurrentUserStateLocked();

                        if (!userState.isUiAutomationSuppressingOtherServices()) {

                            if (readConfigurationForUserStateLocked(userState)) {

                                onUserStateChangedLocked(userState);

                            }

                        }

                    }

                } else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {

                    final String which = intent.getStringExtra(Intent.EXTRA_SETTING_NAME);

                    if (Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES.equals(which)) {