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

Commit de03da48 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android Git Automerger
Browse files

am 37cee0ac: am 481f22ec: Merge "Add OP_AUTH_NEEDED KeyStore result code" 

* commit '37cee0ac':
  Add OP_AUTH_NEEDED KeyStore result code
parents 25684934 37cee0ac

keystore/java/android/security/KeyStore.java

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ public class KeyStore { 
    public static final int UNDEFINED_ACTION = 9;

    public static final int WRONG_PASSWORD = 10;



    /**

     * Per operation authentication is needed before this operation is valid.

     * This is returned from {@link #begin} when begin succeeds but the operation uses

     * per-operation authentication and must authenticate before calling {@link #update} or

     * {@link #finish}.

     */

    public static final int OP_AUTH_NEEDED = 15;



    // Used for UID field to indicate the calling UID.

    public static final int UID_SELF = -1;