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

Commit d322f1af authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix disappearing status bar icons with SHOW_WHEN_LOCKED 

Fixes a bug where launching a SHOW_WHEN_LOCKED window from the bouncer
wouldn't properly restore PhoneStatusBar's state leading to missing
status bar icons.

Bug: 20474073
Change-Id: Ib22dc0dc5a89214af8876ddaea52569e2e24a742
parent 3acf4f5c

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+4 −0
Original line number Diff line number Diff line
@@ -3249,6 +3249,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mKeyguardFadingAway = false;

    }



    public void stopWaitingForKeyguardExit() {

        mWaitingForKeyguardExit = false;

    }



    private void updatePublicMode() {

        setLockscreenPublicMode(

                mStatusBarKeyguardViewManager.isShowing() && mStatusBarKeyguardViewManager

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ public class StatusBarKeyguardViewManager { 
        if (mShowing) {

            if (mOccluded) {

                mPhoneStatusBar.hideKeyguard();

                mPhoneStatusBar.stopWaitingForKeyguardExit();

                mBouncer.hide(false /* destroyView */);

            } else {

                showBouncerOrKeyguard();