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

Commit 01468dae authored by Robert Berry's avatar Robert Berry Committed by Android (Google) Code Review
Browse files

Merge "Make it possible to construct a RecoverySession"

parents 725024bb e04e09ad

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4292,6 +4292,7 @@ package android.security.keystore.recovery { 
  }



  public class RecoveryController {

    method public android.security.keystore.recovery.RecoverySession createRecoverySession();

    method public byte[] generateAndStoreKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;

    method public java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public static android.security.keystore.recovery.RecoveryController getInstance(android.content.Context);

core/java/android/security/keystore/recovery/RecoveryController.java

+9 −0
Original line number Diff line number Diff line
@@ -552,6 +552,15 @@ public class RecoveryController { 
        }

    }



    /**

     * Returns a new {@link RecoverySession}.

     *

     * <p>A recovery session is required to restore keys from a remote store.

     */

    public RecoverySession createRecoverySession() {

        return RecoverySession.newInstance(this);

    }



    InternalRecoveryServiceException wrapUnexpectedServiceSpecificException(

            ServiceSpecificException e) {

        if (e.errorCode == ERROR_SERVICE_INTERNAL_ERROR) {