commit bc56bcdccfae2b6fab28c6efde6481fc90b4a5d0
author Jan Sebechlebsky <jsebechlebsky@google.com> Mon Sep 26 13:15:19 2022 +0200
committer Ján Sebechlebský <jsebechlebsky@google.com> Fri Oct 14 13:51:15 2022 +0000
tree 161595c0c59c00e995697b12b3b5f0ca507c81cc
parent 63db4137eac131eaf3cb9650cad2477366e1e75a

Fix matching device address using audio attributes.

The previous code works only with an assumption there's single tag
present (implicitly added one with device address).

Test: atest AudioServiceHostTest AudioHostTest AudioPolicyHostTest
Test: atest audiosystem_tests audiopolicy_tests
Bug: 244713292
Change-Id: I9a7241521fd7d9246275d1e4d77f6c3b06301163

services/audiopolicy/tests/audiopolicymanager_tests.cpp

diff --git a/services/audiopolicy/tests/audiopolicymanager_tests.cpp b/services/audiopolicy/tests/audiopolicymanager_tests.cpp
index e1bf414..ba5b6b2 100644
--- a/services/audiopolicy/tests/audiopolicymanager_tests.cpp
+++ b/services/audiopolicy/tests/audiopolicymanager_tests.cpp
@@ -1554,7 +1554,16 @@
             .withTags("addr=remote_submix_media"),
         DPTestParam(USAGE_MEDIA_ALARM_CRITERIA, /*expected_match=*/ true)
             .withUsage(AUDIO_USAGE_ASSISTANT)
-            .withTags("addr=remote_submix_media")));
+            .withTags("addr=remote_submix_media"),
+        DPTestParam(USAGE_MEDIA_ALARM_CRITERIA, /*expected_match=*/ true)
+            .withUsage(AUDIO_USAGE_ASSISTANT)
+            .withTags("sometag;addr=remote_submix_media;othertag=somevalue"),
+        DPTestParam(USAGE_MEDIA_ALARM_CRITERIA, /*expected_match=*/ true)
+            .withUsage(AUDIO_USAGE_ASSISTANT)
+            .withTags("addr=remote_submix_media;othertag"),
+        DPTestParam(USAGE_MEDIA_ALARM_CRITERIA, /*expected_match=*/ true)
+            .withUsage(AUDIO_USAGE_ASSISTANT)
+            .withTags("sometag;othertag;addr=remote_submix_media")));
 
 static constexpr audio_session_t TEST_SESSION_ID = static_cast<audio_session_t>(42);
 static constexpr audio_session_t OTHER_SESSION_ID = static_cast<audio_session_t>(77);