commit | 02b7992b62097c0e6dfad44b82ceb1f0a4a2b23a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 28 22:04:25 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 22:04:25 2022 +0000 |
tree | 84ba767a67ec44c199198f21f05a0d3b04749476 | |
parent | 7a6999efd5e09436a0a2137055eca94bf73ab6c0 [diff] | |
parent | 73e15472a4c97358272ec35ae8f5242c76f6f366 [diff] |
Merge "Update KeyMint VINTF fragment to version 2" am: 73e15472a4 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2002270 Change-Id: Ice830ca23216d33c72d61d13003ec7bcf752e969
diff --git a/security/keymint/aidl/default/TEST_MAPPING b/security/keymint/aidl/default/TEST_MAPPING new file mode 100644 index 0000000..2400ccd --- /dev/null +++ b/security/keymint/aidl/default/TEST_MAPPING
@@ -0,0 +1,7 @@ +{ + "presubmit" : [ + { + "name" : "vts_treble_vintf_framework_test" + } + ] +} \ No newline at end of file
diff --git a/security/keymint/aidl/default/android.hardware.security.keymint-service.xml b/security/keymint/aidl/default/android.hardware.security.keymint-service.xml index 4aa05ef..a4d0302 100644 --- a/security/keymint/aidl/default/android.hardware.security.keymint-service.xml +++ b/security/keymint/aidl/default/android.hardware.security.keymint-service.xml
@@ -1,10 +1,12 @@ <manifest version="1.0" type="device"> <hal format="aidl"> <name>android.hardware.security.keymint</name> + <version>2</version> <fqname>IKeyMintDevice/default</fqname> </hal> <hal format="aidl"> <name>android.hardware.security.keymint</name> + <version>2</version> <fqname>IRemotelyProvisionedComponent/default</fqname> </hal> </manifest>