Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd27cb1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix VtsHalAudioCoreTargetTest test case error" into main am: 2b6b7fea am: f4302513 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3521857



Change-Id: I9147cb01a6dbd946539153abbec91f21dc7d5962
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23f971c3 f4302513

audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp

+8 −1
Original line number Diff line number Diff line
@@ -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());