commit 72958047fb12f09813edfd6ac5e0d101976358c7
author Shawn Willden <swillden@google.com> Wed Apr 29 05:34:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 05:34:50 2015 +0000
tree c00b3a61ac39e9474c89b31f2f6f24c9df1fc846
parent 2ceea2160e4ca89c426c2fcf9c77029ecf15e3e1
parent b672afaa8c4e1bd7681115eb56914b61a549b6db

am b672afaa: am adbbba9f: Merge "Add missing error codes from keymaster_defs.h."

* commit 'b672afaa8c4e1bd7681115eb56914b61a549b6db':
  Add missing error codes from keymaster_defs.h.

core/java/android/security/keymaster/KeymasterDefs.java

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 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;