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

2016-05-12 18:00:54 +00:00
parent 3f84c5cb34 37fc1c1ce4
commit 18e9f13b24
1 changed files with 5 additions and 2 deletions
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -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);
+            }
        }
    }