commit f7b432e6f528f70df7a012bfa82652fd04609c0e
author Shawn Willden <swillden@google.com> Sat Mar 26 16:08:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 26 16:08:54 2016 +0000
tree 9b580a974417cda1b859a43144b7139ca42fe422
parent ab2fd6fc6748f34a9f96036e1677f497216cc041
parent 64e76f8febfbb439ff952c418505554f0138a145

Merge "Add keymaster_security_level_t for attestation." into nyc-dev
am: 64e76f8

* commit '64e76f8febfbb439ff952c418505554f0138a145':
  Add keymaster_security_level_t for attestation.

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 046db52..e95850a 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -341,6 +341,11 @@
                                        * completeness. */
 } keymaster_verified_boot_t;
 
+typedef enum {
+    KM_SECURITY_LEVEL_SOFTWARE = 0,
+    KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT = 1,
+} keymaster_security_level_t;
+
 /**
  * Formats for key import and export.
  */