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

Commit a6f21539 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b 

am: 14a9987d

* commit '14a9987d':
  Don't disrupt a11y state when user is unlocked.

Change-Id: I5bea2b2da3b28667b51c8cc8aa0a416ac6274a8e
parents 55505b93 14a9987d

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

+5 −2
Original line number Diff line number Diff line
@@ -902,10 +902,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 


    private void unlockUser(int userId) {

        synchronized (mLock) {

            UserState userState = getUserStateLocked(userId);

            int parentUserId = mSecurityPolicy.resolveProfileParentLocked(userId);

            if (parentUserId == mCurrentUserId) {

                UserState userState = getUserStateLocked(mCurrentUserId);

                onUserStateChangedLocked(userState);

            }

        }

    }



    private void removeUser(int userId) {

        synchronized (mLock) {