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

Commit 27302ab7 authored by Yuchen Liu's avatar Yuchen Liu Committed by Android (Google) Code Review
Browse files

Merge "Make Remote Submix device attachable" into main

parents afefcafa dff2c5ab

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;