diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-04-28 20:34:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-28 20:34:30 +0000 |
| commit | 481f22ecda189554b31a8967c3c42a0877458d61 (patch) | |
| tree | cc298a525716f910cfe77bd74dcfe0f045d0c407 | |
| parent | 6af08c6b7693b4329184c9cccbc474a0b6a9ea5c (diff) | |
| parent | dabe520a3e6b0d0c40adfd748483fa336c43c366 (diff) | |
| download | base-481f22ecda189554b31a8967c3c42a0877458d61.tar.gz | |
Merge "Add OP_AUTH_NEEDED KeyStore result code"
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 3bc1b1773695..896d1c286f65 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -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; |