Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cb52cb52: Fix SDK build.

Browse Source 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
This commit is contained in:
Jim Miller
2010-06-07 21:23:53 -07:00
committed by Android Git Automerger
parent 7d70358a03 cb52cb5225
commit 700a95068e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/KeyguardManager.java
View File

@@ -53,8 +53,8 @@ public class KeyguardManager {
* *
* A good place to call this is from {@link android.app.Activity#onResume()} * 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 * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
* that requires a password. * is enabled that requires a password.
* *
* @see #reenableKeyguard() * @see #reenableKeyguard()
*/ */
@@ -71,8 +71,8 @@ public class KeyguardManager {
* *
* A good place to call this is from {@link android.app.Activity#onPause()} * 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 * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
* that requires a password. * is enabled that requires a password.
* *
* @see #disableKeyguard() * @see #disableKeyguard()
*/ */