summaryrefslogtreecommitdiffstats
path: root/api/16.txt
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-05-24 17:13:06 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2012-05-24 18:09:44 -0700
commit37fde0aca01fcfcd8483df70a4e82f622e15fda2 (patch)
tree6ef0765cc1577d095dc680b1973a2042264870ec /api/16.txt
parent02a43d3adf8a0b43503f5e266ca332fc1ba23ccc (diff)
downloadframeworks_base-37fde0aca01fcfcd8483df70a4e82f622e15fda2.zip
frameworks_base-37fde0aca01fcfcd8483df70a4e82f622e15fda2.tar.gz
frameworks_base-37fde0aca01fcfcd8483df70a4e82f622e15fda2.tar.bz2
Unhide KeyguardManager locked and secure state getters
Unhide the following methods: android.app.KeyguardManager.isKeyguardLocked() android.app.KeyguardManager.isKeyguardSecure() Fix some javadoc typos Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
Diffstat (limited to 'api/16.txt')
-rw-r--r--api/16.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/16.txt b/api/16.txt
index 7e9794f..b8aeb39 100644
--- a/api/16.txt
+++ b/api/16.txt
@@ -3595,6 +3595,8 @@ package android.app {
public class KeyguardManager {
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
method public boolean inKeyguardRestrictedInputMode();
+ method public boolean isKeyguardLocked();
+ method public boolean isKeyguardSecure();
method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
}