Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '27b3819df0ff3bbfb680b5bac54ef7e9b4d3aac1':
  Reset status bar in keyguard, fix MU status bar bug.
This commit is contained in:
John Spurlock
2012-10-04 12:28:53 -07:00
committed by Android Git Automerger
parent 2881ae9dba 27b3819df0
commit 4d97bc2a58
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
View File

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

2
services/java/com/android/server/StatusBarManagerService.java
View File

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