Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev

Author: John Spurlock

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

@@ -291,6 +291,7 @@ public interface ViewMediatorCallback {
         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 @@ void manageDisableListLocked(int userId, int what, IBinder token, String pkg) {
         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;
             }