diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-07 21:23:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-07 21:23:53 -0700 |
| commit | 700a95068e7c774963be318c91df5bf40d765397 (patch) | |
| tree | a5af1d8557183963f81b577ebaf8c295fcebaf34 /core | |
| parent | 7d70358a039426ca2da53cd3330638e2b12ca92e (diff) | |
| parent | cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0 (diff) | |
| download | frameworks_base-700a95068e7c774963be318c91df5bf40d765397.zip frameworks_base-700a95068e7c774963be318c91df5bf40d765397.tar.gz frameworks_base-700a95068e7c774963be318c91df5bf40d765397.tar.bz2 | |
am cb52cb52: Fix SDK build.
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken
* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
Fix SDK build.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/KeyguardManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 34a43bf..e3d8e20 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() */ |