commit dff2c5ab6fe08d65333f5e161e655933c6cebfcd
author yucliu <yucliu@google.com> Wed Oct 23 12:26:14 2024 -0700
committer Yuchen Liu <yucliu@google.com> Thu Oct 24 07:49:23 2024 +0000
tree d78afae71f5c34167dff554da3fe09e6ff41c204
parent 6db92f830136bedb9a752d35ad30d12ef9aef6b5

Make Remote Submix device attachable

The "Remote Submix In" and "Remote Submix Out" should be
connected/disconnected when using DAP.

This patch:
1. Add REMOTE_SUBMIX to the output device list.
2. Set connection to CONNECTION_VIRTUAL when converting to AIDL.

Flag: EXEMPT bugfix
Bug: 375228511
Bug: 344031109
Test: atest CtsMediaAudioTestCases
Change-Id: Iba3daf6586ad4d03af801d213aac2a35f3b252cf

media/java/android/media/AudioDeviceInfo.java

diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java
index 0efefb9..39b29d0 100644
--- a/media/java/android/media/AudioDeviceInfo.java
+++ b/media/java/android/media/AudioDeviceInfo.java
@@ -279,6 +279,7 @@
             TYPE_AUX_LINE,
             TYPE_IP,
             TYPE_BUS,
+            TYPE_REMOTE_SUBMIX,
             TYPE_HEARING_AID,
             TYPE_BUILTIN_SPEAKER_SAFE,
             TYPE_BLE_HEADSET,
@@ -312,6 +313,7 @@
             case TYPE_AUX_LINE:
             case TYPE_IP:
             case TYPE_BUS:
+            case TYPE_REMOTE_SUBMIX:
             case TYPE_HEARING_AID:
             case TYPE_BUILTIN_SPEAKER_SAFE:
             case TYPE_BLE_HEADSET:

media/java/android/media/audio/common/AidlConversion.java

diff --git a/media/java/android/media/audio/common/AidlConversion.java b/media/java/android/media/audio/common/AidlConversion.java
index 65fd51b..c1d73f9 100644
--- a/media/java/android/media/audio/common/AidlConversion.java
+++ b/media/java/android/media/audio/common/AidlConversion.java
@@ -753,9 +753,11 @@
                 break;
             case AudioSystem.DEVICE_IN_REMOTE_SUBMIX:
                 aidl.type = AudioDeviceType.IN_SUBMIX;
+                aidl.connection = AudioDeviceDescription.CONNECTION_VIRTUAL;
                 break;
             case AudioSystem.DEVICE_OUT_REMOTE_SUBMIX:
                 aidl.type = AudioDeviceType.OUT_SUBMIX;
+                aidl.connection = AudioDeviceDescription.CONNECTION_VIRTUAL;
                 break;
             case AudioSystem.DEVICE_IN_ANLG_DOCK_HEADSET:
                 aidl.type = AudioDeviceType.IN_DOCK;