diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-05-24 18:29:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 18:29:39 -0700 |
commit | b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9 (patch) | |
tree | ccbc439191d9db9cb96d0d1fb4f2648bf87b760d /core | |
parent | 731327a93a9e5f1550effaf48fb944d8cae507d5 (diff) | |
parent | 97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e (diff) | |
download | frameworks_base-b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9.zip frameworks_base-b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9.tar.gz frameworks_base-b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9.tar.bz2 |
am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
Unhide KeyguardManager locked and secure state getters
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/KeyguardManager.java | 16 |
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 { |