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

am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo

Browse Source 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
This commit is contained in:
Jim Miller
2010-06-07 19:26:28 -07:00
committed by Android Git Automerger
parent d5f401ba51 bde25c2077
commit c4e37ac0ea
2 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,9 @@ 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.
*
* @see #reenableKeyguard()
*/
public void disableKeyguard() {
@@ -66,7 +69,10 @@ public class KeyguardManager {
* Reenable the keyguard. The keyguard will reappear if the previous
* call to {@link #disableKeyguard()} caused it it to be hidden.
*
* 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
* that requires a password.
*
* @see #disableKeyguard()
*/