Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6979cd1e authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 58c53113: am 56c0e1db: am 61043233: Merge "Change name of confirm... 

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

* commit '58c53113c4fb2cc13ac3e8f37d73fc0dad9b5799':
  Change name of confirm credentials method after API review
parents c2babb4c bb22e2a7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4511,8 +4511,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();

























api/removed.txt



+8
−0




























Original line number
Diff line number
Diff line













package android.app {



























  public class KeyguardManager {













    method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);













  }



























}





























package android.media {































  public class AudioFormat {

































core/java/android/app/KeyguardManager.java



+8
−1




























Original line number
Diff line number
Diff line








@@ -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);