diff options
| author | John Spurlock <jspurlock@google.com> | 2013-04-16 09:55:53 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-04-16 09:58:24 -0400 |
| commit | 9c3b3aec40f62d3685f56135ef9b09f9758b7cc6 (patch) | |
| tree | ceae4ed18d5c6e88f94f6e443dcb9618af028ce9 /policy | |
| parent | c724f65793e203a0ce6e44fee80285650f719c06 (diff) | |
| download | frameworks_base-9c3b3aec40f62d3685f56135ef9b09f9758b7cc6.zip frameworks_base-9c3b3aec40f62d3685f56135ef9b09f9758b7cc6.tar.gz frameworks_base-9c3b3aec40f62d3685f56135ef9b09f9758b7cc6.tar.bz2 | |
Translate MR2 status bar fix to master.
Fix is different in master due to recent keyguard refactoring.
Bug:8567697
Change-Id: Ie668ef0e3018e3f835166508afd9a72c3c1dda84
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 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 e69c51a..9283243 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3273,7 +3273,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; mWinDismissingKeyguard = win; mForceStatusBarFromKeyguard = - mShowingLockscreen && mKeyguardMediator.isSecure(); + mShowingLockscreen && isKeyguardSecure(); } if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) { mAllowLockscreenWhenOn = true; |