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

am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev

Browse Source 
* commit '56c0e1db523779ee7856ac196b7370b7433142b3':
  Change name of confirm credentials method after API review
This commit is contained in:
Jim Miller
2014-08-27 21:36:53 +00:00
committed by Android Git Automerger
parent 275720fe43 c80aaf38ab
commit bb22e2a7a4
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -4510,8 +4510,8 @@ package android.app {
}
public class KeyguardManager {
method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
method public boolean inKeyguardRestrictedInputMode();
method public boolean isKeyguardLocked();
method public boolean isKeyguardSecure();

8
api/removed.txt
View File

@@ -1,3 +1,11 @@
package android.app {
public class KeyguardManager {
method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
}
}
package android.media {
public class AudioFormat {

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

@@ -55,6 +55,13 @@ public class KeyguardManager {
*/
public static final String EXTRA_DESCRIPTION = "android.app.extra.DESCRIPTION";
/**
* @removed
*/
public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
return createConfirmDeviceCredentialIntent(title, description);
}
/**
* Get an intent to prompt the user to confirm credentials (pin, pattern or password)
* for the current user of the device. The caller is expected to launch this activity using
@@ -63,7 +70,7 @@ public class KeyguardManager {
*
* @return the intent for launching the activity or null if no password is required.
**/
public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
public Intent createConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
if (!isKeyguardSecure()) return null;
Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
intent.putExtra(EXTRA_TITLE, title);