diff options
| author | John Spurlock <jspurlock@google.com> | 2013-04-16 06:29:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-16 06:29:54 -0700 |
| commit | c724f65793e203a0ce6e44fee80285650f719c06 (patch) | |
| tree | 161cdd1b02fbbf9d1a2fac24e8a5f26a8622190e | |
| parent | ddca710dc51607ced487e38ecfc12f331473156d (diff) | |
| parent | 4f63f54fdea298358fe9c05a5f4cc975769a69af (diff) | |
| download | frameworks_base-c724f65793e203a0ce6e44fee80285650f719c06.zip frameworks_base-c724f65793e203a0ce6e44fee80285650f719c06.tar.gz frameworks_base-c724f65793e203a0ce6e44fee80285650f719c06.tar.bz2 | |
am 4f63f54f: am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev
* commit '4f63f54fdea298358fe9c05a5f4cc975769a69af':
FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 249ec4c..e69c51a 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -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; |