summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2010-06-08 10:15:27 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-08 10:15:27 -0700
commit1a4ebd42e2abbce86fcbdb0b68b2229892a4e8a5 (patch)
treea3eb0140c42289b88dde801ff30d52388817562e
parentaed22d27bbeb4c5f1f5b8d6ff0c49cdf5c698985 (diff)
parentcfa2d7c93a87266b06dde590ac17071bcc464e62 (diff)
am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build.
-rw-r--r--core/java/android/app/KeyguardManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index 34a43bfc54c6..e3d8e2047c96 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -53,8 +53,8 @@ public class KeyguardManager {
*
* A good place to call this is from {@link android.app.Activity#onResume()}
*
- * Note: This call has no effect while any {@link DevicePolicyManager} is enabled
- * that requires a password.
+ * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
+ * is enabled that requires a password.
*
* @see #reenableKeyguard()
*/
@@ -71,8 +71,8 @@ public class KeyguardManager {
*
* A good place to call this is from {@link android.app.Activity#onPause()}
*
- * Note: This call has no effect while any {@link DevicePolicyManager} is enabled
- * that requires a password.
+ * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
+ * is enabled that requires a password.
*
* @see #disableKeyguard()
*/