Fix parsing of legacy engine config XML files am: bada1f5e01 am: 01fb6b357f (13772cbc) · Commits · e / os / android_frameworks_av

services/audiopolicy/common/include/policy.h

+59 −13

Original line number	Original line	Diff line number	Diff line
	@@ -22,30 +22,76 @@

	#include <media/AudioContainers.h>		#include <media/AudioContainers.h>

			#include <string.h>

	namespace android {		namespace android {

	using StreamTypeVector = std::vector<audio_stream_type_t>;		using StreamTypeVector = std::vector<audio_stream_type_t>;

			#define AUDIO_ENUM_QUOTE(x) #x
			#define AUDIO_ENUM_STRINGIFY(x) AUDIO_ENUM_QUOTE(x)
			#define AUDIO_DEFINE_ENUM_SYMBOL_V(symbol, value) symbol = value,
			#define AUDIO_DEFINE_STRINGIFY_CASE_V(symbol, _) case symbol: return AUDIO_ENUM_STRINGIFY(symbol);
			#define AUDIO_DEFINE_PARSE_CASE_V(symbol, _) \
			if (strcmp(s, AUDIO_ENUM_STRINGIFY(symbol)) == 0) { *t = symbol; return true; } else
			#define AUDIO_DEFINE_MAP_ENTRY_V(symbol, _) { AUDIO_ENUM_STRINGIFY(symbol), symbol },

	/**		/**
	* Legacy audio policy product strategies IDs. These strategies are supported by the default		* Legacy audio policy product strategies IDs. These strategies are supported by the default
	* policy engine.		* policy engine.
	* IMPORTANT NOTE: the order of this enum is important as it determines the priority		* IMPORTANT NOTE: the order of this enum is important as it determines the priority
	* between active strategies for routing decisions: lower enum value => higher prioriy		* between active strategies for routing decisions: lower enum value => higher priority
	*/		*/
			#define AUDIO_LEGACY_STRATEGY_LIST_DEF(V) \
			V(STRATEGY_NONE, -1) \
			V(STRATEGY_PHONE, 0) \
			V(STRATEGY_SONIFICATION, 1) \
			V(STRATEGY_ENFORCED_AUDIBLE, 2) \
			V(STRATEGY_ACCESSIBILITY, 3) \
			V(STRATEGY_SONIFICATION_RESPECTFUL, 4) \
			V(STRATEGY_MEDIA, 5) \
			V(STRATEGY_DTMF, 6) \
			V(STRATEGY_CALL_ASSISTANT, 7) \
			V(STRATEGY_TRANSMITTED_THROUGH_SPEAKER, 8) \
			V(STRATEGY_REROUTING, 9) \
			V(STRATEGY_PATCH, 10)

	enum legacy_strategy {		enum legacy_strategy {
	STRATEGY_NONE = -1,		AUDIO_LEGACY_STRATEGY_LIST_DEF(AUDIO_DEFINE_ENUM_SYMBOL_V)
	STRATEGY_PHONE,		};
	STRATEGY_SONIFICATION,
	STRATEGY_ENFORCED_AUDIBLE,		inline const char* legacy_strategy_to_string(legacy_strategy t) {
	STRATEGY_ACCESSIBILITY,		switch (t) {
	STRATEGY_SONIFICATION_RESPECTFUL,		AUDIO_LEGACY_STRATEGY_LIST_DEF(AUDIO_DEFINE_STRINGIFY_CASE_V)
	STRATEGY_MEDIA,		}
	STRATEGY_DTMF,		return "";
	STRATEGY_CALL_ASSISTANT,		}
	STRATEGY_TRANSMITTED_THROUGH_SPEAKER,
	STRATEGY_REROUTING,		inline bool legacy_strategy_from_string(const char* s, legacy_strategy* t) {
	STRATEGY_PATCH,		AUDIO_LEGACY_STRATEGY_LIST_DEF(AUDIO_DEFINE_PARSE_CASE_V)
			return false;
			}

			namespace audio_policy {

			struct legacy_strategy_map { const char *name; legacy_strategy id; };

			inline std::vector<legacy_strategy_map> getLegacyStrategyMap() {
			return std::vector<legacy_strategy_map> {
			AUDIO_LEGACY_STRATEGY_LIST_DEF(AUDIO_DEFINE_MAP_ENTRY_V)
	};		};
			}

			} // namespace audio_policy

			#undef AUDIO_LEGACY_STRATEGY_LIST_DEF

			#undef AUDIO_DEFINE_MAP_ENTRY_V
			#undef AUDIO_DEFINE_PARSE_CASE_V
			#undef AUDIO_DEFINE_STRINGIFY_CASE_V
			#undef AUDIO_DEFINE_ENUM_SYMBOL_V
			#undef AUDIO_ENUM_STRINGIFY
			#undef AUDIO_ENUM_QUOTE

	static const audio_attributes_t defaultAttr = AUDIO_ATTRIBUTES_INITIALIZER;		static const audio_attributes_t defaultAttr = AUDIO_ATTRIBUTES_INITIALIZER;

services/audiopolicy/engine/common/include/EngineBase.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -117,9 +117,10 @@ public:
	AudioDeviceTypeAddrVector &devices) const override;		AudioDeviceTypeAddrVector &devices) const override;

	engineConfig::ParsingResult loadAudioPolicyEngineConfig(		engineConfig::ParsingResult loadAudioPolicyEngineConfig(
	const media::audio::common::AudioHalEngineConfig& aidlConfig);		const media::audio::common::AudioHalEngineConfig& aidlConfig, bool);

	engineConfig::ParsingResult loadAudioPolicyEngineConfig(const std::string& xmlFilePath = "");		engineConfig::ParsingResult loadAudioPolicyEngineConfig(
			const std::string& xmlFilePath = "", bool isConfigurable = false);

	const ProductStrategyMap &getProductStrategies() const { return mProductStrategies; }		const ProductStrategyMap &getProductStrategies() const { return mProductStrategies; }

services/audiopolicy/engine/common/src/EngineBase.cpp

+4 −3

services/audiopolicy/engine/config/include/EngineConfig.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,7 +116,7 @@ struct ParsingResult {
	/** Parses the provided audio policy usage configuration.		/** Parses the provided audio policy usage configuration.
	* @return audio policy usage @see Config		* @return audio policy usage @see Config
	*/		*/
	ParsingResult parse(const char* path = DEFAULT_PATH);		ParsingResult parse(const char* path = DEFAULT_PATH, bool isConfigurable = false);
	android::status_t parseLegacyVolumes(VolumeGroups &volumeGroups);		android::status_t parseLegacyVolumes(VolumeGroups &volumeGroups);
	ParsingResult convert(const ::android::media::audio::common::AudioHalEngineConfig& aidlConfig);		ParsingResult convert(const ::android::media::audio::common::AudioHalEngineConfig& aidlConfig);
	// Exposed for testing.		// Exposed for testing.

services/audiopolicy/engine/config/src/EngineConfig.cpp

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,8 @@ static const char *const gReferenceAttributeName = "name";

	namespace {		namespace {

			static bool gIsConfigurableEngine = false;

	ConversionResult<std::string> aidl2legacy_AudioHalProductStrategy_ProductStrategyType(int id) {		ConversionResult<std::string> aidl2legacy_AudioHalProductStrategy_ProductStrategyType(int id) {
	using AudioProductStrategyType = media::audio::common::AudioProductStrategyType;		using AudioProductStrategyType = media::audio::common::AudioProductStrategyType;

	@@ -547,9 +549,16 @@ status_t ProductStrategyTraits::deserialize(_xmlDoc doc, const _xmlNode child,
	if (!convertTo(idLiteral, id)) {		if (!convertTo(idLiteral, id)) {
	return BAD_VALUE;		return BAD_VALUE;
	}		}
	ALOGV("%s: %s, %s = %d", __FUNCTION__, name.c_str(), Attributes::id, id);		} else {
			legacy_strategy legacyId;
			if (legacy_strategy_from_string(name.c_str(), &legacyId)) {
			id = legacyId;
			} else if (!gIsConfigurableEngine) {
			return BAD_VALUE;
	}		}
	ALOGV("%s: %s = %s", __FUNCTION__, Attributes::name, name.c_str());		// With a configurable engine it can be a vendor-provided strategy name.
			}
			ALOGV("%s: %s, %s = %d", __FUNCTION__, name.c_str(), Attributes::id, id);

	size_t skipped = 0;		size_t skipped = 0;
	AttributesGroups attrGroups;		AttributesGroups attrGroups;
	@@ -776,7 +785,7 @@ private:

	} // namespace		} // namespace

	ParsingResult parse(const char* path) {		ParsingResult parse(const char* path, bool isConfigurable) {
	XmlErrorHandler errorHandler;		XmlErrorHandler errorHandler;
	auto doc = make_xmlUnique(xmlParseFile(path));		auto doc = make_xmlUnique(xmlParseFile(path));
	if (doc == NULL) {		if (doc == NULL) {
	@@ -801,6 +810,7 @@ ParsingResult parse(const char* path) {
	ALOGE("%s: No version found", __func__);		ALOGE("%s: No version found", __func__);
	return {nullptr, 0};		return {nullptr, 0};
	}		}
			gIsConfigurableEngine = isConfigurable;
	size_t nbSkippedElements = 0;		size_t nbSkippedElements = 0;
	auto config = std::make_unique<Config>();		auto config = std::make_unique<Config>();
	config->version = std::stof(version);		config->version = std::stof(version);

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,7 @@ std::string EngineBase::getProductStrategyName(product_strategy_t id) const {
	}		}

	engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(		engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(
	const media::audio::common::AudioHalEngineConfig& aidlConfig)		const media::audio::common::AudioHalEngineConfig& aidlConfig, bool)
	{		{
	engineConfig::ParsingResult result = engineConfig::convert(aidlConfig);		engineConfig::ParsingResult result = engineConfig::convert(aidlConfig);
	if (result.parsedConfig == nullptr) {		if (result.parsedConfig == nullptr) {
	@@ -141,7 +141,8 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(
	return processParsingResult(std::move(result));		return processParsingResult(std::move(result));
	}		}

	engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(const std::string& xmlFilePath)		engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(
			const std::string& xmlFilePath, bool isConfigurable)
	{		{
	auto fileExists = [](const char* path) {		auto fileExists = [](const char* path) {
	struct stat fileStat;		struct stat fileStat;
	@@ -150,7 +151,7 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(const std::s
	const std::string filePath = xmlFilePath.empty() ? engineConfig::DEFAULT_PATH : xmlFilePath;		const std::string filePath = xmlFilePath.empty() ? engineConfig::DEFAULT_PATH : xmlFilePath;
	engineConfig::ParsingResult result =		engineConfig::ParsingResult result =
	fileExists(filePath.c_str()) ?		fileExists(filePath.c_str()) ?
	engineConfig::parse(filePath.c_str()) : engineConfig::ParsingResult{};		engineConfig::parse(filePath.c_str(), isConfigurable) : engineConfig::ParsingResult{};
	if (result.parsedConfig == nullptr) {		if (result.parsedConfig == nullptr) {
	ALOGD("%s: No configuration found, using default matching phone experience.", __FUNCTION__);		ALOGD("%s: No configuration found, using default matching phone experience.", __FUNCTION__);
	engineConfig::Config config = gDefaultEngineConfig;		engineConfig::Config config = gDefaultEngineConfig;