summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-02-26 13:21:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-26 13:21:05 -0800
commitbbd460d76dc69eca9a14ab1127b95a55429f460a (patch)
treef3f181780e271904f5a91f35284a8c33a9fdaa7d /services
parentcd6828e84220c6bdf92bbca12fcd88a8da76387c (diff)
parent6aea1154bae3a0935fdb9b09b2d91d9548232eb0 (diff)
downloadframeworks_base-bbd460d76dc69eca9a14ab1127b95a55429f460a.zip
frameworks_base-bbd460d76dc69eca9a14ab1127b95a55429f460a.tar.gz
frameworks_base-bbd460d76dc69eca9a14ab1127b95a55429f460a.tar.bz2
am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0': DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/WindowManagerService.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 3978b99..2613988 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -4745,6 +4745,14 @@ public class WindowManagerService extends IWindowManager.Stub
return mPolicy.inKeyguardRestrictedKeyInputMode();
}
+ public boolean isKeyguardLocked() {
+ return mPolicy.isKeyguardLocked();
+ }
+
+ public boolean isKeyguardSecure() {
+ return mPolicy.isKeyguardSecure();
+ }
+
public void closeSystemDialogs(String reason) {
synchronized(mWindowMap) {
for (int i=mWindows.size()-1; i>=0; i--) {