commit 5407bf1ece35ebc66c8c56e36a789b6fb89659d5
author Brian C. Young <bcyoung@google.com> Fri Dec 08 13:29:09 2017 -0800
committer Brian C. Young <bcyoung@google.com> Thu Jan 25 10:28:48 2018 -0800
tree 10f3a7fed19087e0df55d6124089155e8d555183
parent b6de2e0eb9774e45833e0dc82a741bc9f50da90e

Add "Unlocked device required" parameter to keys

Add a keymaster parameter for keys that should be inaccessible when
the device screen is locked. "Locked" here is a state where the device
can be used or accessed without any further trust factor such as a
PIN, password, fingerprint, or trusted face or voice.

This parameter is added to the Java keystore interface for key
creation and import, as well as enums specified by and for the native
keystore process.

Test: go/asym-write-test-plan

Bug: 67752510

Change-Id: Ie526a1beb2ddb6aa10eb77e896e74363db14adaa

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index cb736b3..68dde3d 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -84,6 +84,7 @@
     srcs: ["keystore_cli.cpp"],
     shared_libs: [
         "android.hardware.keymaster@3.0",
+        "android.hardware.keymaster@4.0",
         "libbinder",
         "libcrypto",
         "libcutils",
@@ -109,8 +110,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",