summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-06-18 21:27:11 -0600
committerShawn Willden <swillden@google.com>2015-06-19 09:07:13 -0600
commit91526c1430eb6799fabd8a163fb64f5098a45d68 (patch)
treeaf011c43c3fbed5c0e066919668277549b93ed73 /core/java/android/security
parent096148087980ea5a92e1b96579900ea36727fbbc (diff)
downloadframeworks_base-91526c1430eb6799fabd8a163fb64f5098a45d68.zip
frameworks_base-91526c1430eb6799fabd8a163fb64f5098a45d68.tar.gz
frameworks_base-91526c1430eb6799fabd8a163fb64f5098a45d68.tar.bz2
Add new error codes for rate-limit and max-use failures.
Bug: 21607106 Change-Id: Ia0527341f98726bf74c2bfddd9b9a82974fab954
Diffstat (limited to 'core/java/android/security')
-rw-r--r--core/java/android/security/keymaster/KeymasterDefs.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java
index e4fab12..62c28ac 100644
--- a/core/java/android/security/keymaster/KeymasterDefs.java
+++ b/core/java/android/security/keymaster/KeymasterDefs.java
@@ -191,8 +191,9 @@ public final class KeymasterDefs {
public static final int KM_ERROR_MISSING_NONCE = -51;
public static final int KM_ERROR_INVALID_NONCE = -52;
public static final int KM_ERROR_MISSING_MAC_LENGTH = -53;
- public static final int KM_ERROR_RESCOPABLE_KEY_NOT_USABLE = -54;
+ public static final int KM_ERROR_KEY_RATE_LIMIT_EXCEEDED = -54;
public static final int KM_ERROR_CALLER_NONCE_PROHIBITED = -55;
+ public static final int KM_ERROR_KEY_MAX_OPS_EXCEEDED = -56;
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;