Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dff2c5ab authored by yucliu's avatar yucliu Committed by Yuchen Liu
Browse files

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
parent 6db92f83

media/java/android/media/AudioDeviceInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ public final class AudioDeviceInfo { 
            TYPE_AUX_LINE,

            TYPE_IP,

            TYPE_BUS,

            TYPE_REMOTE_SUBMIX,

            TYPE_HEARING_AID,

            TYPE_BUILTIN_SPEAKER_SAFE,

            TYPE_BLE_HEADSET,
@@ -312,6 +313,7 @@ public final class AudioDeviceInfo { 
            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

+2 −0
Original line number Diff line number Diff line
@@ -753,9 +753,11 @@ public class AidlConversion { 
                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;