commit ef01d9796740b44d098ea1de355cb62af4f52cb5
author Shawn Willden <swillden@google.com> Thu Jan 28 23:28:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 28 23:28:10 2016 +0000
tree 48c34d508afcc27c7022e893d382be9e1ee5eb4e
parent e3a89161a2bf5519ef178ed34263b46bad34b3a7
parent b9733d9bff225ae0b16feeb64283b123225af465

Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY." am: f704e8a939
am: b9733d9bff

* commit 'b9733d9bff225ae0b16feeb64283b123225af465':
  Add KM_TAG_ALLOW_WHILE_ON_BODY.

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index c0ca514..80b2318 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -109,6 +109,9 @@
                                                    If absent, authentication is required for every
                                                    use.  Authentication state is lost when the
                                                    device is powered off. */
+    KM_TAG_ALLOW_WHILE_ON_BODY = KM_BOOL | 506, /* Allow key to be used after authentication timeout
+                                                 * if device is still on-body (requires secure
+                                                 * on-body sensor. */
 
     /* Application access control */
     KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Specified to indicate key is usable by all