commit b9733d9bff225ae0b16feeb64283b123225af465
author Shawn Willden <swillden@google.com> Thu Jan 28 23:25:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 28 23:25:42 2016 +0000
tree 10d64255f53d6a35054d9e4919be3e5b9eb49010
parent 330ee96ad9ca40f38525dc575b7d4dbe337e7184
parent f704e8a939a4bfb85127b31e7226589e9e31b98d

Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY."
am: f704e8a939

* commit 'f704e8a939a4bfb85127b31e7226589e9e31b98d':
  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 5b5d2ec..fd53adf 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