commit ffb4b4663c8b231b75439ba3541a488c0825eb3e
author Brian Young <bcyoung@google.com> Thu Feb 22 23:36:19 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 23 18:03:25 2018 +0000
tree e4554ed6f2729ca676a476ac25e7c3bea10dba82
parent 6ba564ff368b58bea5a8da101459d1e741b16ec8

Revert "Restore "Add "Unlocked device required" parameter to keys""

This reverts commit a684cb6c2cee0835065b123e4bb698487de26939.

Reason for revert: Regression in creating auth-bound keys

Bug: 73773914

Bug: 67752510

Change-Id: Ib215d63efe442916f90065015a57614b097cd74d
(cherry picked from commit 968f997468f1fcb5c68157a850c8d5c79576c00c)

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 25a4faa..6e812f2 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -112,8 +112,6 @@
     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. */
-    KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 508, /* Require the device screen to be unlocked if the
-                                                      * key is used. */
 
     /* Application access control */
     KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Specified to indicate key is usable by all
@@ -454,7 +452,6 @@
     KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64,
     KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65,
     KM_ERROR_CANNOT_ATTEST_IDS = -66,
-    KM_ERROR_DEVICE_LOCKED = -71,
 
     KM_ERROR_UNIMPLEMENTED = -100,
     KM_ERROR_VERSION_MISMATCH = -101,