Reset status bar in keyguard, fix MU status bar bug.

Two things going on here, status bar disabled flags need to be reset
on user switch.  Also make status bar's internal disable-record lookup
multi-user aware.

Bug:7278793
Change-Id: I1d7088d956a065330736da4c09cc1874c528c133

2 files changed, 2 insertions, 1 deletions

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
index 83324bc4e715..21d2ad191cd4 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
+++ b/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
diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java
index 5d9441b842ef..439eebe7bca4 100644
--- a/services/java/com/android/server/StatusBarManagerService.java
+++ b/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;
             }