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

Commit 13ce6270 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Fix broken statusbar disable flags" into nyc-dev 

am: c99f05e1

* commit 'c99f05e1':
  Fix broken statusbar disable flags

Change-Id: I6d033fff5adc59b858dd9d66838968adc4665225
parents 3bd314fe c99f05e1

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

+3 −2
Original line number Diff line number Diff line
@@ -7465,9 +7465,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);

        }

    }

}