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

Browse Source 
am: a6f2153953

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

Change-Id: Id741cc938e24c534f52f9f1ff92045fb08dec3f3
This commit is contained in:
Phil Weaver
2016-05-12 18:13:35 +00:00
committed by android-build-merger
parent 6f88016d93 a6f2153953
commit 2d85fd839e
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) {
synchronized (mLock) {
UserState userState = getUserStateLocked(userId);
onUserStateChangedLocked(userState);
int parentUserId = mSecurityPolicy.resolveProfileParentLocked(userId);
if (parentUserId == mCurrentUserId) {
UserState userState = getUserStateLocked(mCurrentUserId);
onUserStateChangedLocked(userState);
}
}
}