summaryrefslogtreecommitdiff
path: root/core/java/android/app/KeyguardManager.java
diff options
context:
space:
mode:
authorNicolas Falliere <nicof@google.com>2012-06-18 17:21:06 -0700
committerNicolas Falliere <nicof@google.com>2012-06-18 17:22:34 -0700
commit9530e3a22d5ffa2019d1a5177b6a441d4d6d048b (patch)
tree87588c39f929b97140284b60b26e5be03618bcb0 /core/java/android/app/KeyguardManager.java
parentec7c7ebf01121d17f7a12e827bd77c024eab54e8 (diff)
Added or fixed doctrings for required permissions.
Bug: 6591338 Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
Diffstat (limited to 'core/java/android/app/KeyguardManager.java')
-rw-r--r--core/java/android/app/KeyguardManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index a79a8fc939fe..ef61af715dfa 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -62,6 +62,9 @@ public class KeyguardManager {
* Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
* is enabled that requires a password.
*
+ * <p>This method requires the caller to hold the permission
+ * {@link android.Manifest.permission#DISABLE_KEYGUARD}.
+ *
* @see #reenableKeyguard()
*/
public void disableKeyguard() {
@@ -80,6 +83,9 @@ public class KeyguardManager {
* Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
* is enabled that requires a password.
*
+ * <p>This method requires the caller to hold the permission
+ * {@link android.Manifest.permission#DISABLE_KEYGUARD}.
+ *
* @see #disableKeyguard()
*/
public void reenableKeyguard() {
@@ -188,6 +194,9 @@ public class KeyguardManager {
* This will, if the keyguard is secure, bring up the unlock screen of
* the keyguard.
*
+ * <p>This method requires the caller to hold the permission
+ * {@link android.Manifest.permission#DISABLE_KEYGUARD}.
+ *
* @param callback Let's you know whether the operation was succesful and
* it is safe to launch anything that would normally be considered safe
* once the user has gotten past the keyguard.