summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shawn Willden <swillden@google.com> 2015-04-29 04:30:17 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-04-29 04:30:18 +0000
commitadbbba9f1dc364e4d3911562fdb8f2e666922e2f (patch)
tree9f8184e993466a6b01e91d740f2c082de8c6bd06
parent2ddfcc4ade5d6db69808a340ae54280872559ec1 (diff)
parent5b8352bd166eaa88fa23a0575e5f2585d1c7a3b0 (diff)
Merge "Add missing error codes from keymaster_defs.h."
-rw-r--r--core/java/android/security/keymaster/KeymasterDefs.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java
index 25ebe759421e..574b2080d373 100644
--- a/core/java/android/security/keymaster/KeymasterDefs.java
+++ b/core/java/android/security/keymaster/KeymasterDefs.java
@@ -193,6 +193,9 @@ public final class KeymasterDefs {
public static final int KM_ERROR_UNSUPPORTED_EC_FIELD = -50;
public static final int KM_ERROR_MISSING_NONCE = -51;
public static final int KM_ERROR_INVALID_NONCE = -52;
+ public static final int KM_ERROR_UNSUPPORTED_CHUNK_LENGTH = -53;
+ public static final int KM_ERROR_RESCOPABLE_KEY_NOT_USABLE = -54;
+ public static final int KM_ERROR_CALLER_NONCE_PROHIBITED = -55;
public static final int KM_ERROR_UNIMPLEMENTED = -100;
public static final int KM_ERROR_VERSION_MISMATCH = -101;
public static final int KM_ERROR_UNKNOWN_ERROR = -1000;