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