drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2012-05-24 18:27:37 -07:00
committed by Android (Google) Code Review
parent f738810247 37fde0aca0
commit 97594d6cea
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/16.txt
View File

@ -3595,6 +3595,8 @@ package android.app {
public class KeyguardManager { public class KeyguardManager {
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
method public boolean inKeyguardRestrictedInputMode(); method public boolean inKeyguardRestrictedInputMode();
method public boolean isKeyguardLocked();
method public boolean isKeyguardSecure();
method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String); method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
} }

2
api/current.txt
View File

@ -3595,6 +3595,8 @@ package android.app {
public class KeyguardManager { public class KeyguardManager {
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
method public boolean inKeyguardRestrictedInputMode(); method public boolean inKeyguardRestrictedInputMode();
method public boolean isKeyguardLocked();
method public boolean isKeyguardSecure();
method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String); method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
} }

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

@ -28,7 +28,7 @@ import android.view.IOnKeyguardExitResult;
* Class that can be used to lock and unlock the keyboard. Get an instance of this * Class that can be used to lock and unlock the keyboard. Get an instance of this
* class by calling {@link android.content.Context#getSystemService(java.lang.String)} * class by calling {@link android.content.Context#getSystemService(java.lang.String)}
* with argument {@link android.content.Context#KEYGUARD_SERVICE}. The * with argument {@link android.content.Context#KEYGUARD_SERVICE}. The
* Actual class to control the keyboard locking is * actual class to control the keyboard locking is
* {@link android.app.KeyguardManager.KeyguardLock}. * {@link android.app.KeyguardManager.KeyguardLock}.
*/ */
public class KeyguardManager { public class KeyguardManager {
@ -73,7 +73,7 @@ public class KeyguardManager {
/** /**
* Reenable the keyguard. The keyguard will reappear if the previous * Reenable the keyguard. The keyguard will reappear if the previous
* call to {@link #disableKeyguard()} caused it it to be hidden. * call to {@link #disableKeyguard()} caused 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()}
* *
@ -130,13 +130,9 @@ public class KeyguardManager {
} }
/** /**
* isKeyguardLocked
*
* Return whether the keyguard is currently locked. * Return whether the keyguard is currently locked.
* *
* @return true if in keyguard is locked. * @return true if keyguard is locked.
*
* @hide
*/ */
public boolean isKeyguardLocked() { public boolean isKeyguardLocked() {
try { try {
@ -147,13 +143,9 @@ public class KeyguardManager {
} }
/** /**
* isKeyguardSecure
*
* Return whether the keyguard requires a password to unlock. * Return whether the keyguard requires a password to unlock.
* *
* @return true if in keyguard is secure. * @return true if keyguard is secure.
*
* @hide
*/ */
public boolean isKeyguardSecure() { public boolean isKeyguardSecure() {
try { try {