diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-30 05:14:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 05:14:51 +0000 |
| commit | 7230bdf23bf905a60ac2c209f04fcf83264fec56 (patch) | |
| tree | f41507270368e9d520fb1f6803357164279e951b /core | |
| parent | 21df222fa8f3fdeb38dc7d59b6bcba15971d340b (diff) | |
| parent | dbc00eb0aacfa7d93673798f0226260be2f3d194 (diff) | |
| download | frameworks_base-7230bdf23bf905a60ac2c209f04fcf83264fec56.zip frameworks_base-7230bdf23bf905a60ac2c209f04fcf83264fec56.tar.gz frameworks_base-7230bdf23bf905a60ac2c209f04fcf83264fec56.tar.bz2 | |
Merge "Add missing error codes from keymaster_defs.h." into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 3 |
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 40baf9c..d8834fe 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -194,6 +194,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; |