commit 27b3819df0ff3bbfb680b5bac54ef7e9b4d3aac1
author John Spurlock <jspurlock@google.com> Thu Oct 04 12:26:17 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 04 12:26:18 2012 -0700
tree aef62e66d72917c62a8eb746cf4997391270abba
parent e4ed092076430e4cc8aa2e179883f721da5b2a61
parent 4e6922d89e72e79a8ab31ae2cb8a19d85bee91f8

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

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

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 83324bc..21d2ad1 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 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

diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java
index 5d9441b..439eebe 100644
--- a/services/java/com/android/server/StatusBarManagerService.java
+++ b/services/java/com/android/server/StatusBarManagerService.java
@@ -544,7 +544,7 @@
         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;
             }