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

Commit 4e6922d8 authored by John Spurlock's avatar John Spurlock
Browse files

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
parent ebf7e285

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;

            }