diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-07 17:52:42 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-06-07 19:19:29 -0700 |
| commit | d6b5705e188e55a3b9dbb07954b16564b1a31b9f (patch) | |
| tree | f5b89bc6a0d24f7414dc2fd55846d89b5e8f794c /core/java/android/app/KeyguardManager.java | |
| parent | df2e2eff9446c0220515fa7aab7857135e04e12e (diff) | |
| download | frameworks_base-d6b5705e188e55a3b9dbb07954b16564b1a31b9f.zip frameworks_base-d6b5705e188e55a3b9dbb07954b16564b1a31b9f.tar.gz frameworks_base-d6b5705e188e55a3b9dbb07954b16564b1a31b9f.tar.bz2 | |
Fix 2737842: disable keyguard API when device policy is enabled.
This fix disables KeyguardManager's enable/disable API when any
device policy admin requests a policy that enforces a password.
Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
Diffstat (limited to 'core/java/android/app/KeyguardManager.java')
| -rw-r--r-- | core/java/android/app/KeyguardManager.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 0c07553..34a43bf 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -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() */ |