Merge changes from topic "add-km-41" am: f66777ad50 am: 7f7e9608dc

am: 78926e3375

Change-Id: I7964555358e9150d58f53eb154ee7acf5eea1a78
This commit is contained in:
Shawn Willden
2019-11-21 15:01:55 -08:00
committed by android-build-merger
15 changed files with 458 additions and 2 deletions

View File

@@ -256,7 +256,7 @@
<hal format="hidl" optional="false">
<name>android.hardware.keymaster</name>
<version>3.0</version>
<version>4.0</version>
<version>4.0-1</version>
<interface>
<name>IKeymasterDevice</name>
<instance>default</instance>
@@ -264,7 +264,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.keymaster</name>
<version>4.0</version>
<version>4.0-1</version>
<interface>
<name>IKeymasterDevice</name>
<instance>strongbox</instance>