commit f2ee5f3ffb534d18d68b785755d9228bb7aaff58
author Ray Chin <raychin@google.com> Mon Mar 03 23:45:48 2025 -0800
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Mar 03 23:45:48 2025 -0800
tree 3886f80e3bcb8774e97f250a09afb8d9a8b27b5b
parent 98b2bbdbdb4bdbfde7e4cfbd7d1e411d5ba72293

Fix VtsHalAudioCoreTargetTest test case error

By design, all ForceUseForceXXX will be parsed into an
AudioHalCapCriterionV2 instance of tag forceConfigForUse. But in the
test, it only compare the forceConfigForUse tag without further
comparing the tag of AudioPolicyForUse. This will make the first
criterion always be selected to proceed. This change fix it by adding
missing comparison of tag of AudioPolicyForUse.

Bug: 399043600
Test: build and test
Flag: EXEMPT test fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:534853f68dc76a334a4e98bf2bc62c6061708699)
Merged-In: Ie2fb2bdaef35c692c85276208b67dd3aa657ab17
Change-Id: Ie2fb2bdaef35c692c85276208b67dd3aa657ab17

audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp

diff --git a/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp b/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp
index 7b15e5e..b1c5a1a 100644
--- a/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp
+++ b/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp
@@ -367,8 +367,15 @@
             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());