Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main (58d953e4) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/Config.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -27,12 +27,11 @@ using aidl::android::media::audio::common::AudioHalEngineConfig;

		namespace aidl::android::hardware::audio::core {
		ndk::ScopedAStatus Config::getSurroundSoundConfig(SurroundSoundConfig* _aidl_return) {
		static const auto& func = __func__;
		static const SurroundSoundConfig surroundSoundConfig = [this]() {
		SurroundSoundConfig surroundCfg;
		if (mAudioPolicyConverter.getStatus() == ::android::OK) {
		surroundCfg = mAudioPolicyConverter.getSurroundSoundConfig();
		} else {
		LOG(WARNING) << __func__ << mAudioPolicyConverter.getError();
		SurroundSoundConfig surroundCfg = mAudioPolicyConverter.getSurroundSoundConfig();
		if (mAudioPolicyConverter.getStatus() != ::android::OK) {
		LOG(WARNING) << func << ": " << mAudioPolicyConverter.getError();
		}
		return surroundCfg;
		}();
		@@ -42,21 +41,22 @@ ndk::ScopedAStatus Config::getSurroundSoundConfig(SurroundSoundConfig* _aidl_ret
		}

		ndk::ScopedAStatus Config::getEngineConfig(AudioHalEngineConfig* _aidl_return) {
		static const auto& func = __func__;
		static const AudioHalEngineConfig returnEngCfg = [this]() {
		AudioHalEngineConfig engConfig;
		if (mEngConfigConverter.getStatus() == ::android::OK) {
		engConfig = mEngConfigConverter.getAidlEngineConfig();
		} else {
		LOG(INFO) << __func__ << mEngConfigConverter.getError();
		LOG(INFO) << func << ": " << mEngConfigConverter.getError();
		if (mAudioPolicyConverter.getStatus() == ::android::OK) {
		engConfig = mAudioPolicyConverter.getAidlEngineConfig();
		} else {
		LOG(WARNING) << __func__ << mAudioPolicyConverter.getError();
		LOG(WARNING) << func << ": " << mAudioPolicyConverter.getError();
		}
		}
		// Logging full contents of the config is an overkill, just provide statistics.
		LOG(DEBUG) << "getEngineConfig: number of strategies parsed: "
		<< engConfig.productStrategies.size()
		LOG(DEBUG) << func
		<< ": number of strategies parsed: " << engConfig.productStrategies.size()
		<< ", default strategy: " << engConfig.defaultProductStrategyId
		<< ", number of volume groups parsed: " << engConfig.volumeGroups.size();
		return engConfig;

audio/aidl/default/include/core-impl/XmlConverter.h

+9 −3

Original line number	Diff line number	Diff line
		@@ -53,10 +53,16 @@ class XmlConverter {
		const ::android::status_t& status) {
		std::string errorMessage;
		if (status != ::android::OK) {
		if (!isReadableConfigFile) {
		errorMessage = "Could not read requested config file:" + configFilePath;
		if (configFilePath.empty()) {
		errorMessage = "No audio configuration files found";
		} else if (!isReadableConfigFile) {
		errorMessage = std::string("Could not read requested XML config file: \"")
		.append(configFilePath)
		.append("\"");
		} else {
		errorMessage = "Invalid config file: " + configFilePath;
		errorMessage = std::string("Invalid XML config file: \"")
		.append(configFilePath)
		.append("\"");
		}
		}
		return errorMessage;