diff options
| author | 2012-10-04 12:26:17 -0700 | |
|---|---|---|
| committer | 2012-10-04 12:26:18 -0700 | |
| commit | 27b3819df0ff3bbfb680b5bac54ef7e9b4d3aac1 (patch) | |
| tree | aef62e66d72917c62a8eb746cf4997391270abba | |
| parent | e4ed092076430e4cc8aa2e179883f721da5b2a61 (diff) | |
| parent | 4e6922d89e72e79a8ab31ae2cb8a19d85bee91f8 (diff) | |
Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/StatusBarManagerService.java | 2 |
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; } |