summaryrefslogtreecommitdiffstats
path: root/keystore/java
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2015-04-24 10:32:18 -0700
committerChad Brubaker <cbrubaker@google.com>2015-04-28 15:49:29 -0700
commit560d653e554882218232cd0fe4711be42145727a (patch)
treee35363caf18bccbe21f041edffe62a67c49007d1 /keystore/java
parent6b3e0587a052121fd572fd609abcbc75a89d53d6 (diff)
downloadframeworks_base-560d653e554882218232cd0fe4711be42145727a.zip
frameworks_base-560d653e554882218232cd0fe4711be42145727a.tar.gz
frameworks_base-560d653e554882218232cd0fe4711be42145727a.tar.bz2
Add OP_AUTH_NEEDED KeyStore result code
OP_AUTH_NEEDED will be returned from begin when an operation needs a per operation authentication before calling update. Note that the begin call succeeds when this error is returned, the token and handle are valid. (cherry picked from commit dabe520a3e6b0d0c40adfd748483fa336c43c366) Change-Id: I0ba4e997360843b5eb6c1db9c5fcd1c4d5a2c717
Diffstat (limited to 'keystore/java')
-rw-r--r--keystore/java/android/security/KeyStore.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index 8c49ff0..5d863c2 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;