Snap for 12727401 from 65ce9e35bb0d6b155d325c44e7013ae8a4a05474 to 25Q1-release (f8e1cf46) · Commits · e / os / android_hardware_interfaces

audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -818,6 +818,7 @@ INSTANTIATE_TEST_SUITE_P(DynamicsProcessingTest, DynamicsProcessingLimiterConfig
		[](const char c) { return !std::isalnum(c); }, '_');
		return name;
		});
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DynamicsProcessingLimiterConfigDataTest);

		/**
		* Test DynamicsProcessing ChannelConfig

compatibility_matrices/compatibility_matrix.202504.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,14 @@
		<instance>nonsecure</instance>
		</interface>
		</hal>
		<hal format="aidl">
		<name>android.hardware.security.see.hwcrypto</name>
		<version>1</version>
		<interface>
		<name>IHwCryptoKey</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="aidl" updatable-via-apex="true">
		<name>android.hardware.security.secureclock</name>
		<version>1</version>

compatibility_matrices/exclude/fcm_exclude.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ bool ShouldCheckMissingAidlHalsInFcm(const std::string& packageAndVersion) {
		// Fastboot HAL is only used by recovery. Recovery is owned by OEM. Framework
		// does not depend on this HAL, hence it is not declared in any manifests or matrices.
		"android.hardware.fastboot@",
		"android.hardware.security.see.hwcrypto.types",
		"android.hardware.security.see.storage",
		};

security/keymint/aidl/android/hardware/security/keymint/KeyCreationResult.aidl

+37 −22

Original line number	Diff line number	Diff line
		@@ -125,14 +125,25 @@ parcelable KeyCreationResult {
		* straightforward translation of the KeyMint tag/value parameter lists to ASN.1.
		*
		* KeyDescription ::= SEQUENCE {
		* attestationVersion INTEGER, # Value 400
		* attestationSecurityLevel SecurityLevel, # See below
		* keyMintVersion INTEGER, # Value 400
		* keymintSecurityLevel SecurityLevel, # See below
		* attestationChallenge OCTET_STRING, # Tag::ATTESTATION_CHALLENGE from attestParams
		* uniqueId OCTET_STRING, # Empty unless key has Tag::INCLUDE_UNIQUE_ID
		* softwareEnforced AuthorizationList, # See below
		* hardwareEnforced AuthorizationList, # See below
		* -- attestationVersion must be 400.
		* attestationVersion INTEGER,
		* -- attestationSecurityLevel is the SecurityLevel of the location where the attested
		* -- key is stored. Must match keymintSecurityLevel.
		* attestationSecurityLevel SecurityLevel,
		* -- keyMintVersion must be 400.
		* keyMintVersion INTEGER,
		* -- keyMintSecurityLevel is the SecurityLevel of the IKeyMintDevice. Must match
		* -- attestationSecurityLevel.
		* keyMintSecurityLevel SecurityLevel,
		* -- attestationChallenge contains Tag::ATTESTATION_CHALLENGE from attestParams.
		* attestationChallenge OCTET_STRING,
		* -- uniqueId is empty unless the key has Tag::INCLUDE_UNIQUE_ID.
		* uniqueId OCTET_STRING,
		* -- softwareEnforced contains the authorization tags enforced by the Android system.
		* softwareEnforced AuthorizationList,
		* -- hardwareEnforced contains the authorization tags enforced by a secure environment
		* -- (TEE or StrongBox).
		* hardwareEnforced AuthorizationList,
		* }
		*
		* SecurityLevel ::= ENUMERATED {
		@@ -142,12 +153,15 @@ parcelable KeyCreationResult {
		* }
		*
		* RootOfTrust ::= SEQUENCE {
		* -- verifiedBootKey must contain a SHA-256 digest of the public key embedded in the
		* -- "vbmeta" partition if the device's bootloader is locked, or 32 bytes of zeroes if the
		* -- device's bootloader is unlocked.
		* verifiedBootKey OCTET_STRING,
		* deviceLocked BOOLEAN,
		* verifiedBootState VerifiedBootState,
		* # verifiedBootHash must contain a SHA-256 digest of all binaries and components validated
		* # by Verified Boot. Updating any verified binary or component must cause this value to
		* # change.
		* -- verifiedBootHash must contain a SHA-256 digest of all binaries and components
		* -- validated by Verified Boot. Updating any verified binary or component must cause this
		* -- value to change.
		* verifiedBootHash OCTET_STRING,
		* }
		*
		@@ -158,15 +172,15 @@ parcelable KeyCreationResult {
		* Failed (3),
		* }
		*
		* # Modules contains version information for APEX modules.
		* # Note that the Modules information is DER-encoded before being hashed, which requires a
		* # specific ordering (lexicographic by encoded value) for the constituent Module entries. This
		* # ensures that the ordering of Module entries is predictable and that the resulting SHA-256
		* # hash value is identical for the same set of modules.
		* -- Modules contains version information for APEX modules.
		* -- Note that the Modules information is DER-encoded before being hashed, which requires a
		* -- specific ordering (lexicographic by encoded value) for the constituent Module entries.
		* -- This ensures that the ordering of Module entries is predictable and that the resulting
		* -- SHA-256 hash value is identical for the same set of modules.
		* Modules ::= SET OF Module
		* Module ::= SEQUENCE {
		* packageName OCTET_STRING,
		* version INTEGER, # As determined at boot time
		* version INTEGER, -- As determined at boot time
		* }
		*
		* -- Note that the AuthorizationList SEQUENCE is also used in IKeyMintDevice::importWrappedKey
		@@ -181,11 +195,11 @@ parcelable KeyCreationResult {
		* purpose [1] EXPLICIT SET OF INTEGER OPTIONAL,
		* algorithm [2] EXPLICIT INTEGER OPTIONAL,
		* keySize [3] EXPLICIT INTEGER OPTIONAL,
		* blockMode [4] EXPLICIT SET OF INTEGER OPTIONAL, -- symmetric only
		* blockMode [4] EXPLICIT SET OF INTEGER OPTIONAL, -- Symmetric keys only
		* digest [5] EXPLICIT SET OF INTEGER OPTIONAL,
		* padding [6] EXPLICIT SET OF INTEGER OPTIONAL,
		* callerNonce [7] EXPLICIT NULL OPTIONAL, -- symmetric only
		* minMacLength [8] EXPLICIT INTEGER OPTIONAL, -- symmetric only
		* callerNonce [7] EXPLICIT NULL OPTIONAL, -- Symmetric keys only
		* minMacLength [8] EXPLICIT INTEGER OPTIONAL, -- Symmetric keys only
		* ecCurve [10] EXPLICIT INTEGER OPTIONAL,
		* rsaPublicExponent [200] EXPLICIT INTEGER OPTIONAL,
		* mgfDigest [203] EXPLICIT SET OF INTEGER OPTIONAL,
		@@ -195,7 +209,7 @@ parcelable KeyCreationResult {
		* originationExpireDateTime [401] EXPLICIT INTEGER OPTIONAL,
		* usageExpireDateTime [402] EXPLICIT INTEGER OPTIONAL,
		* usageCountLimit [405] EXPLICIT INTEGER OPTIONAL,
		* userSecureId [502] EXPLICIT INTEGER OPTIONAL, -- only used on import
		* userSecureId [502] EXPLICIT INTEGER OPTIONAL, -- Only used on key import
		* noAuthRequired [503] EXPLICIT NULL OPTIONAL,
		* userAuthType [504] EXPLICIT INTEGER OPTIONAL,
		* authTimeout [505] EXPLICIT INTEGER OPTIONAL,
		@@ -221,7 +235,8 @@ parcelable KeyCreationResult {
		* bootPatchLevel [719] EXPLICIT INTEGER OPTIONAL,
		* deviceUniqueAttestation [720] EXPLICIT NULL OPTIONAL,
		* attestationIdSecondImei [723] EXPLICIT OCTET_STRING OPTIONAL,
		* moduleHash [724] EXPLICIT OCTET_STRING OPTIONAL, -- SHA-256 hash of DER-encoded `Modules`
		* -- moduleHash contains a SHA-256 hash of DER-encoded `Modules`
		* moduleHash [724] EXPLICIT OCTET_STRING OPTIONAL,
		* }
		*/
		Certificate[] certificateChain;

security/keymint/aidl/default/Android.bp

+26 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ rust_binary {
		],
		}

		// The following target declares the latest version of KeyMint.
		prebuilt_etc {
		name: "android.hardware.hardware_keystore.xml",
		sub_dir: "permissions",
		@@ -111,6 +112,24 @@ prebuilt_etc {
		src: "android.hardware.hardware_keystore.xml",
		}

		// The following targets (and underlying XML files) declare specific
		// versions of KeyMint. Vendors should use the version that matches the
		// version of the KeyMint HAL that the device implements.

		prebuilt_etc {
		name: "android.hardware.hardware_keystore_V1.xml",
		sub_dir: "permissions",
		vendor: true,
		src: "android.hardware.hardware_keystore_V1.xml",
		}

		prebuilt_etc {
		name: "android.hardware.hardware_keystore_V2.xml",
		sub_dir: "permissions",
		vendor: true,
		src: "android.hardware.hardware_keystore_V2.xml",
		}

		prebuilt_etc {
		name: "android.hardware.hardware_keystore_V3.xml",
		sub_dir: "permissions",
		@@ -118,6 +137,13 @@ prebuilt_etc {
		src: "android.hardware.hardware_keystore_V3.xml",
		}

		prebuilt_etc {
		name: "android.hardware.hardware_keystore_V4.xml",
		sub_dir: "permissions",
		vendor: true,
		src: "android.hardware.hardware_keystore_V4.xml",
		}

		rust_library {
		name: "libkmr_hal_nonsecure",
		crate_name: "kmr_hal_nonsecure",