Fix SDK build.
On branch fix_sdk Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: core/java/android/app/KeyguardManager.java Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
This commit is contained in:
@@ -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()
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user