diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-19 15:13:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 15:13:22 +0000 |
| commit | df0b80e4e1ca8145440161f063b20540095e70ba (patch) | |
| tree | c4dbd070bcad148c31c8f93f4ae7bc476cecda9a | |
| parent | 43cf8d1ed10728f40736fa82c1a569d9aa82bfc6 (diff) | |
| parent | 91526c1430eb6799fabd8a163fb64f5098a45d68 (diff) | |
| download | frameworks_base-df0b80e4e1ca8145440161f063b20540095e70ba.zip frameworks_base-df0b80e4e1ca8145440161f063b20540095e70ba.tar.gz frameworks_base-df0b80e4e1ca8145440161f063b20540095e70ba.tar.bz2 | |
Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 3 |
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; |