diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-22 13:11:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-22 13:11:11 -0800 |
| commit | 3c85a4e6396dabf7f0061ff2c6e9f9b35793eadd (patch) | |
| tree | 2bdd9d2f8185ba5ba5eaa8332a91b56e4455be29 /policy | |
| parent | 117549fc785428b4c9307b909a7dc75761b10145 (diff) | |
| parent | 520d8bc1d840966b5519195aaa514597a662c053 (diff) | |
| download | frameworks_base-3c85a4e6396dabf7f0061ff2c6e9f9b35793eadd.zip frameworks_base-3c85a4e6396dabf7f0061ff2c6e9f9b35793eadd.tar.gz frameworks_base-3c85a4e6396dabf7f0061ff2c6e9f9b35793eadd.tar.bz2 | |
Merge "KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()"
Diffstat (limited to 'policy')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 8fd0f05..84588b7 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2438,6 +2438,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mKeyguardMediator.isShowingAndNotHidden(); } + + /** {@inheritDoc} */ + public boolean isKeyguardLocked() { + return keyguardOn(); + } + + /** {@inheritDoc} */ + public boolean isKeyguardSecure() { + return mKeyguardMediator.isSecure(); + } + /** {@inheritDoc} */ public boolean inKeyguardRestrictedKeyInputMode() { return mKeyguardMediator.isInputRestricted(); |