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

Commit 37fc1c1c authored by Phil Weaver's avatar Phil Weaver
Browse files

Don't disrupt a11y state when user is unlocked. 

AccessibilityManagerService#unlockUser was assuming that we should
switch to the unlocked user's state. If that user is a new work
profile, this transition disables all accessibility features.

Bug: 28726050
Change-Id: I3797d34b580d00642b204fff3fc9a07b720738e0
parent f829c146

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) {