summaryrefslogtreecommitdiffstats
path: root/core
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 /core
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 'core')
-rw-r--r--core/java/android/app/KeyguardManager.java16
1 files changed, 4 insertions, 12 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index 0fe7b5c..a79a8fc 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -28,7 +28,7 @@ import android.view.IOnKeyguardExitResult;
* Class that can be used to lock and unlock the keyboard. Get an instance of this
* class by calling {@link android.content.Context#getSystemService(java.lang.String)}
* with argument {@link android.content.Context#KEYGUARD_SERVICE}. The
- * Actual class to control the keyboard locking is
+ * actual class to control the keyboard locking is
* {@link android.app.KeyguardManager.KeyguardLock}.
*/
public class KeyguardManager {
@@ -73,7 +73,7 @@ public class KeyguardManager {
/**
* Reenable the keyguard. The keyguard will reappear if the previous
- * call to {@link #disableKeyguard()} caused it it to be hidden.
+ * call to {@link #disableKeyguard()} caused it to be hidden.
*
* A good place to call this is from {@link android.app.Activity#onPause()}
*
@@ -130,13 +130,9 @@ public class KeyguardManager {
}
/**
- * isKeyguardLocked
- *
* Return whether the keyguard is currently locked.
*
- * @return true if in keyguard is locked.
- *
- * @hide
+ * @return true if keyguard is locked.
*/
public boolean isKeyguardLocked() {
try {
@@ -147,13 +143,9 @@ public class KeyguardManager {
}
/**
- * isKeyguardSecure
- *
* Return whether the keyguard requires a password to unlock.
*
- * @return true if in keyguard is secure.
- *
- * @hide
+ * @return true if keyguard is secure.
*/
public boolean isKeyguardSecure() {
try {