drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5584737fff6350ab09fb53e6a73bbff770930727':
  FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
This commit is contained in:
John Spurlock
2013-04-16 06:26:51 -07:00
committed by Android Git Automerger
parent 12d0071a65 5584737fff
commit 4f63f54fde
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@ -3204,7 +3204,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mDismissKeyguard = mWinDismissingKeyguard == win ? mDismissKeyguard = mWinDismissingKeyguard == win ?
DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;
mWinDismissingKeyguard = win; mWinDismissingKeyguard = win;
mForceStatusBarFromKeyguard = false; mForceStatusBarFromKeyguard =
mShowingLockscreen && mKeyguardMediator.isSecure();
} }
if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) { if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {
mAllowLockscreenWhenOn = true; mAllowLockscreenWhenOn = true;