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

Commit c724f657 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 4f63f54f: am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status... 

am 4f63f54f: am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev

* commit '4f63f54f':
  FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
parents ddca710d 4f63f54f

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −1
Original line number Diff line number Diff line
@@ -3272,7 +3272,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mDismissKeyguard = mWinDismissingKeyguard == win ?

                            DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;

                    mWinDismissingKeyguard = win;

                    mForceStatusBarFromKeyguard = false;

                    mForceStatusBarFromKeyguard =

                            mShowingLockscreen && mKeyguardMediator.isSecure();

                }

                if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                    mAllowLockscreenWhenOn = true;