| commit | ea426cbf2e0b3064adf090e4cd3d6932b02ae54d | [log] [tgz] |
|---|---|---|
| author | Karuna Wadhera <kwadhera@google.com> | Wed Oct 09 23:18:33 2024 +0000 |
| committer | Karuna Wadhera <kwadhera@google.com> | Wed Oct 30 17:26:34 2024 +0000 |
| tree | b87452778ebaef05d9b67c3d10e3f7cd7966bb37 | |
| parent | e37f8956125a6df354aa2b0fa26be975ba1d8c67 [diff] |
Add module info AIDL changes and bump the KeyMint version Bug: 369375199 Test: Manually checked that module info is added to the attestation when sent via IKeyMintDevice::setModuleInfo. Ignore-AOSP-First: Lands with other HAL version bump changes to avoid build failure. At least one of the changes is internal. Will cherry-pick to AOSP ASAP. Change-Id: Idb11823e6b65cf17d62ae8687febffee860565e3
diff --git a/security/keymint/aidl/default/android.hardware.hardware_keystore.xml b/security/keymint/aidl/default/android.hardware.hardware_keystore.xml index 4c75596..1ab2133 100644 --- a/security/keymint/aidl/default/android.hardware.hardware_keystore.xml +++ b/security/keymint/aidl/default/android.hardware.hardware_keystore.xml
@@ -14,5 +14,5 @@ limitations under the License. --> <permissions> - <feature name="android.hardware.hardware_keystore" version="300" /> + <feature name="android.hardware.hardware_keystore" version="400" /> </permissions>
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 0568ae6..6bdd33e 100644 --- a/security/keymint/aidl/default/android.hardware.security.keymint-service.xml +++ b/security/keymint/aidl/default/android.hardware.security.keymint-service.xml
@@ -1,7 +1,7 @@ <manifest version="1.0" type="device"> <hal format="aidl"> <name>android.hardware.security.keymint</name> - <version>3</version> + <version>4</version> <fqname>IKeyMintDevice/default</fqname> </hal> <hal format="aidl">