commit 0d86511204afeeefa1acdab00c101cd37a2687dd
author Lorena Torres-Huerta <lorenatorres@google.com> Wed Jan 18 20:50:51 2023 +0000
committer Lorena Torres-Huerta <lorenatorres@google.com> Wed Jan 18 20:50:51 2023 +0000
tree 9b30f5544c7c9588c89d98da1ef0a31f7603db3d
parent d69e9fa37b796b128c7cbe496bca21bb19d070be

Remote Submix Out is not a permanently attached device, and thus
requires a non-empty string for its connection.

Bug: 205884982
Test: m
Change-Id: If6591a41b23a31ff4036ec6d21f4e3ce29a46bb9

media/audioaidlconversion/AidlConversionCppNdk.cpp

diff --git a/media/audioaidlconversion/AidlConversionCppNdk.cpp b/media/audioaidlconversion/AidlConversionCppNdk.cpp
index 37887f6..1bbd86e 100644
--- a/media/audioaidlconversion/AidlConversionCppNdk.cpp
+++ b/media/audioaidlconversion/AidlConversionCppNdk.cpp
@@ -477,6 +477,15 @@
             {
                 AUDIO_DEVICE_IN_ECHO_REFERENCE, make_AudioDeviceDescription(
                         AudioDeviceType::IN_ECHO_REFERENCE)
+            },
+            {
+                AUDIO_DEVICE_IN_REMOTE_SUBMIX, make_AudioDeviceDescription(
+                         AudioDeviceType::IN_SUBMIX)
+            },
+            {
+                AUDIO_DEVICE_OUT_REMOTE_SUBMIX, make_AudioDeviceDescription(
+                        AudioDeviceType::OUT_SUBMIX,
+                        GET_DEVICE_DESC_CONNECTION(VIRTUAL))
             }
         }};
         append_AudioDeviceDescription(pairs,
@@ -495,9 +504,6 @@
                 AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE,
                 GET_DEVICE_DESC_CONNECTION(HDMI));
         append_AudioDeviceDescription(pairs,
-                AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX,
-                AudioDeviceType::IN_SUBMIX, AudioDeviceType::OUT_SUBMIX);
-        append_AudioDeviceDescription(pairs,
                 AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET, AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET,
                 AudioDeviceType::IN_DOCK, AudioDeviceType::OUT_DOCK,
                 GET_DEVICE_DESC_CONNECTION(ANALOG));