Revert^2 "Audio CAP: Address ANAPIC comments, Part 3."
Refactor the stable version of parcelables `AudioPolicyForceUse`
and `AudioPolicyForcedConfig` for better structure. The tag of
the `AudioPolicyForceUse` union is equivalent to the old enum
with the same name. The value of the union replaces
the old `AudioPolicyForcedConfig` enum.
The list of allowed values has been moved into the XSD
schema 'audio_policy_engine_configuration.xsd'.
Bug: 364310317
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I85f58f3310842679b9bf80cad3ac2494c4527ea2
diff --git a/audio/aidl/default/CapEngineConfigXmlConverter.cpp b/audio/aidl/default/CapEngineConfigXmlConverter.cpp
index a6e78b9..20fbca4 100644
--- a/audio/aidl/default/CapEngineConfigXmlConverter.cpp
+++ b/audio/aidl/default/CapEngineConfigXmlConverter.cpp
@@ -96,8 +96,8 @@
} else if (!fastcmp<strncmp>(criterionName.c_str(), kXsdcForceConfigForUse,
strlen(kXsdcForceConfigForUse))) {
AudioHalCapCriterionV2::ForceConfigForUse value;
- value.forceUse = VALUE_OR_RETURN(convertForceUseCriterionToAidl(criterionName));
- value.values.emplace_back(VALUE_OR_RETURN(convertForcedConfigToAidl(criterionValue)));
+ value.values.emplace_back(
+ VALUE_OR_RETURN(convertForceUseToAidl(criterionName, criterionValue)));
rule.criterionAndValue = AudioHalCapCriterionV2::make<Tag::forceConfigForUse>(value);
} else {
LOG(ERROR) << __func__ << " unrecognized criterion " << criterionName;