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

Merge "Don't disrupt a11y state when user is unlocked." into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-05-12 18:00:54 +00:00
committed by Android (Google) Code Review
parent 3f84c5cb34 37fc1c1ce4
commit 18e9f13b24
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,10 +902,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private void unlockUser(int userId) { private void unlockUser(int userId) {
synchronized (mLock) { synchronized (mLock) {
UserState userState = getUserStateLocked(userId); int parentUserId = mSecurityPolicy.resolveProfileParentLocked(userId);
if (parentUserId == mCurrentUserId) {
UserState userState = getUserStateLocked(mCurrentUserId);
onUserStateChangedLocked(userState); onUserStateChangedLocked(userState);
} }
} }
}
private void removeUser(int userId) { private void removeUser(int userId) {
synchronized (mLock) { synchronized (mLock) {