commit | 37fc1c1ce4629973a101ab5cde41406bb6266793 | [log] [tgz] |
---|---|---|
author | Phil Weaver <pweaver@google.com> | Wed May 11 16:24:13 2016 -0700 |
committer | Phil Weaver <pweaver@google.com> | Wed May 11 16:24:13 2016 -0700 |
tree | da062df59975555f46be7c87f6b57cf86f0c3ddd | |
parent | f829c1463b4805545d15924ad6243b9405eb83d6 [diff] |
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
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 7f977dd..7da969f 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -902,8 +902,11 @@ private void unlockUser(int userId) { synchronized (mLock) { - UserState userState = getUserStateLocked(userId); - onUserStateChangedLocked(userState); + int parentUserId = mSecurityPolicy.resolveProfileParentLocked(userId); + if (parentUserId == mCurrentUserId) { + UserState userState = getUserStateLocked(mCurrentUserId); + onUserStateChangedLocked(userState); + } } }