commit 50e1759db488dfe80a2213e9199d34ae7dc39608
author Shawn Willden <swillden@google.com> Tue Apr 14 18:23:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 14 18:23:44 2015 +0000
tree ff7d269f2a12547c456f4d6a36f444fa4dcba712
parent 4b49035055487058cb0f82db6eb8b3ec740934d8
parent 6c93927dd390abcf0e6254a38ef2c0f14fc1a51e

am 6c93927d: am 4827279c: Merge "Add KM_ORIGIN_UNKNOWN."

* commit '6c93927dd390abcf0e6254a38ef2c0f14fc1a51e':
  Add KM_ORIGIN_UNKNOWN.

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 81a62fe..2b43f2c 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -206,7 +206,11 @@
  */
 typedef enum {
     KM_ORIGIN_GENERATED = 0, /* Generated in keymaster */
-    KM_ORIGIN_IMPORTED = 2, /* Imported, origin unknown */
+    KM_ORIGIN_IMPORTED = 2,  /* Imported, origin unknown */
+    KM_ORIGIN_UNKNOWN = 3,   /* Keymaster did not record origin.  This value can only be seen on
+                              * keys in a keymaster0 implementation.  The keymaster0 adapter uses
+                              * this value to document the fact that it is unkown whether the key
+                              * was generated inside or imported into keymaster. */
 } keymaster_key_origin_t;
 
 /**