commit 07ece85dac2b59d4350083196885d8f4413d9f49
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 21 16:54:35 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 21 16:54:35 2023 +0000
tree d1b49fd94533403da3a0050ad7b482970033d764
parent a017705ad5a513e98c4f8694c7c868471703ddfc
parent a678aadab4ace78bd43b31f5157588447451ad9d

Merge "AIDL: Fix test after aosp/2704653" into main

media/audioaidlconversion/TEST_MAPPING

diff --git a/media/audioaidlconversion/TEST_MAPPING b/media/audioaidlconversion/TEST_MAPPING
index 216bc12..203ed2f 100644
--- a/media/audioaidlconversion/TEST_MAPPING
+++ b/media/audioaidlconversion/TEST_MAPPING
@@ -1,8 +1,12 @@
 {
   "presubmit": [
     {
-      "name": "audio_aidl_conversion_tests",
-      "name": "audio_aidl_ndk_conversion_tests",
+      "name": "audio_aidl_conversion_tests"
+    },
+    {
+      "name": "audio_aidl_ndk_conversion_tests"
+    },
+    {
       "name": "audio_aidl_ndk_cpp_conversion_tests"
     }
   ]

media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp

diff --git a/media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp b/media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp
index a7bb02a..2a5d2f2 100644
--- a/media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp
+++ b/media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp
@@ -143,7 +143,8 @@
 }
 
 AudioDeviceDescription make_ADD_RSubmixIn() {
-    return make_AudioDeviceDescription(AudioDeviceType::IN_SUBMIX);
+    return make_AudioDeviceDescription(AudioDeviceType::IN_SUBMIX,
+                                       AudioDeviceDescription::CONNECTION_VIRTUAL());
 }
 
 AudioDeviceDescription make_ADD_DefaultOut() {