Skip to content

Commit 4e6922d

Browse files
author
John Spurlock
committed
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
1 parent ebf7e28 commit 4e6922d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ public interface ViewMediatorCallback {
291291
public void onUserSwitched(int userId) {
292292
// Note that the mLockPatternUtils user has already been updated from setCurrentUser.
293293
synchronized (KeyguardViewMediator.this) {
294+
adjustStatusBarLocked();
294295
resetStateLocked(true);
295296
}
296297
// We should always go back to the locked state when a user

services/java/com/android/server/StatusBarManagerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ void manageDisableListLocked(int userId, int what, IBinder token, String pkg) {
544544
int i;
545545
for (i=0; i<N; i++) {
546546
DisableRecord t = mDisableRecords.get(i);
547-
if (t.token == token) {
547+
if (t.token == token && t.userId == userId) {
548548
tok = t;
549549
break;
550550
}

0 commit comments

Comments
 (0)