am 4d97bc2a: am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev

* commit '4d97bc2a58fcd206f77948427efd86e035a44a16':
  Reset status bar in keyguard, fix MU status bar bug.

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

@@ -291,6 +291,7 @@ public class KeyguardViewMediator {
         public void onUserSwitched(int userId) {
             // Note that the mLockPatternUtils user has already been updated from setCurrentUser.
             synchronized (KeyguardViewMediator.this) {
+                adjustStatusBarLocked();
                 resetStateLocked(true);
             }
             // We should always go back to the locked state when a user

services/java/com/android/server/StatusBarManagerService.java

@@ -544,7 +544,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub
         int i;
         for (i=0; i<N; i++) {
             DisableRecord t = mDisableRecords.get(i);
-            if (t.token == token) {
+            if (t.token == token && t.userId == userId) {
                 tok = t;
                 break;
             }