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 
am: 18e9f13b24

* commit '18e9f13b24867fb4a41391c5512376db413449a8':
  Don't disrupt a11y state when user is unlocked.

Change-Id: I03a057fb4278466250395958252a349d4dfe2e3c
This commit is contained in:
Phil Weaver
2016-05-12 18:07:32 +00:00
committed by android-build-merger
parent 59ce88720c 18e9f13b24
commit b60d029ed2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,8 +902,11 @@ 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);
onUserStateChangedLocked(userState); if (parentUserId == mCurrentUserId) {
UserState userState = getUserStateLocked(mCurrentUserId);
onUserStateChangedLocked(userState);
}
} }
} }