Loading audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp +8 −1 Original line number Diff line number Diff line Loading @@ -367,8 +367,15 @@ class AudioCoreConfig : public testing::TestWithParam<std::string> { auto criterionValue = criterionRule.criterionAndValue; auto matchesWhen = criterionRule.matchingRule; auto criteriaIt = find_if(criteria.begin(), criteria.end(), [&](const auto& criterion) { auto getForceConfigTag = [](const AudioHalCapCriterionV2& forceConfig) { return forceConfig.get<AudioHalCapCriterionV2::forceConfigForUse>() .values[0].getTag(); }; return criterion.has_value() && criterion.value().getTag() == selectionCriterion.getTag(); criterion.value().getTag() == selectionCriterion.getTag() && (criterion.value().getTag() != AudioHalCapCriterionV2::forceConfigForUse || getForceConfigTag(criterion.value()) == getForceConfigTag(selectionCriterion)); }); EXPECT_NE(criteriaIt, criteria.end()) << " Invalid rule criterion " << toString(selectionCriterion.getTag()); Loading Loading
audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp +8 −1 Original line number Diff line number Diff line Loading @@ -367,8 +367,15 @@ class AudioCoreConfig : public testing::TestWithParam<std::string> { auto criterionValue = criterionRule.criterionAndValue; auto matchesWhen = criterionRule.matchingRule; auto criteriaIt = find_if(criteria.begin(), criteria.end(), [&](const auto& criterion) { auto getForceConfigTag = [](const AudioHalCapCriterionV2& forceConfig) { return forceConfig.get<AudioHalCapCriterionV2::forceConfigForUse>() .values[0].getTag(); }; return criterion.has_value() && criterion.value().getTag() == selectionCriterion.getTag(); criterion.value().getTag() == selectionCriterion.getTag() && (criterion.value().getTag() != AudioHalCapCriterionV2::forceConfigForUse || getForceConfigTag(criterion.value()) == getForceConfigTag(selectionCriterion)); }); EXPECT_NE(criteriaIt, criteria.end()) << " Invalid rule criterion " << toString(selectionCriterion.getTag()); Loading