Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b3819d authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents e4ed0920 4e6922d8

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

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }