From 560d653e554882218232cd0fe4711be42145727a Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Fri, 24 Apr 2015 10:32:18 -0700 Subject: [PATCH] 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 --- keystore/java/android/security/KeyStore.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 8c49ff0a3eca9..5d863c2d969d9 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;