commit 33ba689441ef89fc889143eac6c0542870836c05
author Lorena Torres-Huerta <lorenatorres@google.com> Fri Jan 20 01:27:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 20 01:27:33 2023 +0000
tree 49f7b01cd2da63b03a6c517dda30bebc28bc7da7
parent b99f2de35ab7c528011d8940fb85b07815a1e842
parent 6ece4d972ec1db9852b301ae840585b130e95893

Merge "Remote Submix Out is not a permanently attached device, and thus requires a non-empty string for its connection." am: c3c62a1eb8 am: 6ece4d972e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2393575

Change-Id: If0e6e22ff0b42a11ccf3f46bca40f3ca451aef67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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));