Snap for 12742097 from 54f806e41c44b0d2cfa00ad7a03d328d1a2c7236 to 25Q1-release (b5cec8ff) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/config/audioPolicy/api/current.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,18 @@ package android.audio.policy.configuration {
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_FLAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_HE_AAC_V1;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_HE_AAC_V2;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_AAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_FLAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_OPUS;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_PCM;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_AAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_FLAC;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_OPUS;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_PCM;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IEC60958;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IEC61937;
		enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_LC3;

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

+12 −0

Original line number	Diff line number	Diff line
		@@ -417,6 +417,18 @@
		<xs:enumeration value="AUDIO_FORMAT_APTX_ADAPTIVE_R4"/>
		<xs:enumeration value="AUDIO_FORMAT_DTS_HD_MA"/>
		<xs:enumeration value="AUDIO_FORMAT_DTS_UHD_P2"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_OPUS"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_AAC"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_PCM"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_FLAC"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_OPUS"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_AAC"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_PCM"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_FLAC"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM"/>
		<xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC"/>
		</xs:restriction>
		</xs:simpleType>
		<xs:simpleType name="extendableAudioFormat">

automotive/audiocontrol/aidl/default/converter/src/CarAudioConfigurationXmlConverter.cpp

+3 −5

Original line number	Diff line number	Diff line
		@@ -645,11 +645,9 @@ bool parseVolumeActivationType(const xsd::ActivationType& xsdType,
		bool parseVolumeGroupActivationEntry(const xsd::ActivationVolumeConfigEntryType& xsdEntry,
		api::VolumeActivationConfigurationEntry& entry) {
		if (!xsdEntry.hasInvocationType()) {
		LOG(ERROR) << __func__ << " Activation config entry missing invocation type";
		return false;
		}

		if (!parseVolumeActivationType(xsdEntry.getInvocationType(), entry.type)) {
		// Legacy file had default invocation type as on playback changed
		entry.type = api::VolumeInvocationType::ON_PLAYBACK_CHANGED;
		} else if (!parseVolumeActivationType(xsdEntry.getInvocationType(), entry.type)) {
		LOG(ERROR) << __func__ << " Could not parse configuration entry type";
		return false;
		}

automotive/audiocontrol/aidl/vts/VtsHalAudioControlTargetTest.cpp

+11 −4

Original line number	Diff line number	Diff line
		@@ -149,7 +149,9 @@ bool hasValidAudioRoute(const DeviceToContextEntry& entry, std::string& message,
		return false;
		}
		if (groupDevices.contains(address)) {
		message = " Audio device address can not repeat in the same volume group";
		message =
		" Audio device address can not repeat in the same volume group or within audio"
		" zone configuration if not using configurable audio policy engine";
		return false;
		}
		groupDevices.insert(address);
		@@ -196,7 +198,8 @@ bool hadValidAudioFadeConfiguration(const AudioFadeConfiguration& fadeConfigurat

		void validateVolumeGroupInfo(const AudioZoneConfig& audioZoneConfig,
		const VolumeGroupConfig& volumeGroupConfig,
		const AudioDeviceConfiguration& deviceConfig) {
		const AudioDeviceConfiguration& deviceConfig,
		std::set<std::string>& groupDevices) {
		std::string zoneConfigName = testutils::toAlphaNumeric(ToString(audioZoneConfig.name));
		std::string volumeGroupName = testutils::toAlphaNumeric(ToString(volumeGroupConfig.name));
		std::string volumeGroupInfo =
		@@ -209,7 +212,6 @@ void validateVolumeGroupInfo(const AudioZoneConfig& audioZoneConfig,
		EXPECT_FALSE(volumeGroupConfig.name.empty())
		<< volumeGroupInfo << " must have a non-empty volume name";
		}
		std::set<std::string> groupDevices;
		for (const auto& audioRoute : volumeGroupConfig.carAudioRoutes) {
		std::string routeMessage;
		EXPECT_TRUE(hasValidAudioRoute(audioRoute, routeMessage, groupDevices))
		@@ -254,6 +256,7 @@ void validateAudioZoneConfiguration(const AudioZone& carAudioZone,
		std::set<std::string> contextInfoNames;
		EXPECT_FALSE(audioZoneConfig.volumeGroups.empty())
		<< "Volume groups for zone config " << zoneConfigName.c_str();
		std::set<std::string> groupDevices;
		for (const auto& volumeGroup : audioZoneConfig.volumeGroups) {
		ALOGI("Zone config name %s volume group test %s", zoneConfigName.c_str(),
		ToString(volumeGroup.name).c_str());
		@@ -264,7 +267,11 @@ void validateAudioZoneConfiguration(const AudioZone& carAudioZone,
		<< "Context " << context << " repeats in zone config " << zoneConfigName;
		contextInfoNames.insert(context);
		}
		validateVolumeGroupInfo(audioZoneConfig, volumeGroup, deviceConfig);
		// Configurable audio policy engine can share devices among volume groups
		if (deviceConfig.routingConfig == CONFIGURABLE_AUDIO_ENGINE_ROUTING) {
		groupDevices.clear();
		}
		validateVolumeGroupInfo(audioZoneConfig, volumeGroup, deviceConfig, groupDevices);
		}
		const auto& audioZoneContexts = carAudioZone.audioZoneContext.audioContextInfos;
		std::map<std::string, AudioZoneContextInfo> infoNameToInfo;

automotive/vehicle/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,14 @@ package {
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		cc_defaults {
		name: "VehicleHalInterfaceDefaults-V3",
		static_libs: [
		"android.hardware.automotive.vehicle-V3-ndk",
		"android.hardware.automotive.vehicle.property-V4-ndk",
		],
		}

		cc_defaults {
		name: "VehicleHalInterfaceDefaults",
		static_libs: [