commit ccb492da4478a11210b1a7aa885ad38958ca837f
author Brian Young <bcyoung@google.com> Thu Feb 22 23:36:01 2018 +0000
committer Brian Young <bcyoung@google.com> Fri Feb 23 01:31:22 2018 +0000
tree 5677e5b0fa9c8152481252beb2b226e2cb0e3364
parent 05900c1ad8bb08646bdcbb68a90904b86ebf1c45

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

This reverts commit 05900c1ad8bb08646bdcbb68a90904b86ebf1c45.

Reason for revert: Regression in creating auth-bound keys

Bug: 73773914

Bug: 67752510

Change-Id: I2b247ec871d2a0a2adb9100559e4c821aeba265d

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 8b2cb62..9e882e4 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -84,7 +84,6 @@
     srcs: ["keystore_cli.cpp"],
     shared_libs: [
         "android.hardware.keymaster@3.0",
-        "android.hardware.keymaster@4.0",
         "libbinder",
         "libcrypto",
         "libcutils",
@@ -110,8 +109,8 @@
     srcs: ["keystore_cli_v2.cpp"],
     shared_libs: [
         "android.hardware.confirmationui@1.0",
+        "android.hardware.keymaster@3.0",
         "libbinder",
-        "android.hardware.keymaster@4.0",
         "libchrome",
         "libutils",
         "libhidlbase",