| commit | 5cc1805e43eeac81eadf8e521fecd31b93e83dc7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 28 22:33:00 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 22:33:00 2022 +0000 |
| tree | 67f5b21b352e69c195b56817920e89f9d1163cdb | |
| parent | 783acdb09cc32edf479a4b95fea0e6f9b9d7b1ba [diff] | |
| parent | 02b7992b62097c0e6dfad44b82ceb1f0a4a2b23a [diff] |
Merge "Update KeyMint VINTF fragment to version 2" am: 73e15472a4 am: 02b7992b62 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2002270 Change-Id: I093525cf6c83aaecf13c9ea01fa322a7a4901275
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>