Merge "Revert "audiopolicy: capengine: aidl hybrid mode enable"" into main (4a1e6e3a) · Commits · e / os / android_frameworks_av

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,6 @@ public:

		// The source used to indicate the configuration from the AIDL HAL.
		static const constexpr char* const kAidlConfigSource = "AIDL HAL";
		// The source used to indicate the configuration from the AIDL HAL but engine still use XML.
		static const constexpr char* const kHybridAidlConfigSource = "AIDL HAL Hybrid CAP";
		// The source used to indicate the default fallback configuration.
		static const constexpr char* const kDefaultConfigSource = "AudioPolicyConfig::setDefault";
		// The suffix of the "engine default" implementation shared library name.

+0 −3

Original line number	Diff line number	Diff line
		@@ -272,9 +272,6 @@ status_t AudioPolicyConfig::loadFromAidl(const media::AudioPolicyConfig& aidl) {
		mSource = kAidlConfigSource;
		if (aidl.engineConfig.capSpecificConfig.has_value()) {
		setEngineLibraryNameSuffix(kCapEngineLibraryNameSuffix);
		if (!aidl.engineConfig.capSpecificConfig.value().domains.has_value()) {
		mSource = kHybridAidlConfigSource;
		}
		}
		// No need to augmentData() as AIDL HAL must provide correct mic addresses.
		return NO_ERROR;

+7 −16

Original line number	Diff line number	Diff line
		@@ -27,10 +27,7 @@ cc_library_shared {
		"-Wall",
		"-Werror",
		"-Wextra",
		] + select(release_flag("RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"), {
		true: [],
		default: ["-DENABLE_CAP_AIDL_HYBRID_MODE"],
		}),
		],
		local_include_dirs: ["include"],
		header_libs: [
		"libaudiopolicycommon",
		@@ -62,16 +59,10 @@ cc_library_shared {
		"latest_android_media_audio_common_types_cpp_shared",
		],
		required: [
		] + select(release_flag("RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"), {
		true: [
		"CapClass.xml",
		"CapProductStrategies.xml",
		"CapSubsystem-CommonTypes.xml",
		"CapSubsystem.xml",
		"ParameterFrameworkConfigurationCap.xml",
		],
		default: [
		// empty, provisionned by the vendor
		],
		}),
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -75,13 +75,8 @@ status_t Engine::loadFromHalConfigWithFallback(

		auto capResult = capEngineConfig::convert(aidlConfig);
		if (capResult.parsedConfig == nullptr) {
		#ifdef ENABLE_CAP_AIDL_HYBRID_MODE
		ALOGE("%s CapEngine Config invalid, falling back on vendor XML for engine", __func__);
		return loadFromXmlConfigWithFallback(engineConfig::DEFAULT_PATH);
		#else
		ALOGE("%s CapEngine Config invalid", __func__);
		return BAD_VALUE;
		#endif
		}
		status_t ret = loadWithFallback(aidlConfig);
		if (ret != NO_ERROR) {

+1 −4

Original line number	Diff line number	Diff line
		@@ -16,10 +16,7 @@ cc_library {
		"-Wall",
		"-Werror",
		"-Wextra",
		] + select(release_flag("RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"), {
		true: [],
		default: ["-DENABLE_CAP_AIDL_HYBRID_MODE"],
		}),
		],
		header_libs: [
		"libaudiofoundation_headers",
		"libaudiopolicycapengine_config_headers",