commit a7342da2489d4f898cbd361fbea7a12d8abba207
author Andy Hung <hunga@google.com> Mon Aug 21 23:13:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 21 23:13:48 2023 +0000
tree fc601c9973f46b1b8b82c1c29f649bef55516167
parent 590dd5e0fac2daea4bcecdb5e63d84e0976766f6
parent da336353871cb49f15261933da402a0319d9f08b

Merge "AudioFlinger: Use callback to get screen state" into udc-dev-plus-aosp

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 976a532..9a46b20 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() {