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

Commit 2a629106 authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix broken statusbar disable flags 

Fixes a bug where the disable flags were
always applied to user 0 instead of the current
user because the user switch dispatch from
WindowManager was broken.

Change-Id: Ib2faf0777c5367af5bf07cb2d11c51ed0222d65c
Fixes: 28062568
parent 250c617d

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -7459,9 +7459,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (mKeyguardDelegate != null) {

            mKeyguardDelegate.setCurrentUser(newUserId);

        }

        if (mStatusBarService != null) {

        IStatusBarService statusBar = getStatusBarService();

        if (statusBar != null) {

            try {

                mStatusBarService.setCurrentUser(newUserId);

                statusBar.setCurrentUser(newUserId);

            } catch (RemoteException e) {

                // oh well

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { 
    private int mDisabled1 = 0;

    private int mDisabled2 = 0;



    private Object mLock = new Object();

    private final Object mLock = new Object();

    // encompasses lights-out mode and other flags defined on View

    private int mSystemUiVisibility = 0;

    private int mFullscreenStackSysUiVisibility;
@@ -926,6 +926,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { 
                                + " pkg=" + tok.pkg

                                + " token=" + tok.token);

            }

            pw.println("  mCurrentUserId=" + mCurrentUserId);

        }

    }

}