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

Commit 7656a21d authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: add Bluetooth LE Audio broadcast device"

parents cbfc6f58 277373ea

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20961,6 +20961,7 @@ package android.media { 
    method public boolean isSink();

    method public boolean isSource();

    field public static final int TYPE_AUX_LINE = 19; // 0x13

    field public static final int TYPE_BLE_BROADCAST = 30; // 0x1e

    field public static final int TYPE_BLE_HEADSET = 26; // 0x1a

    field public static final int TYPE_BLE_SPEAKER = 27; // 0x1b

    field public static final int TYPE_BLUETOOTH_A2DP = 8; // 0x8

media/aidl/android/media/audio/common/AudioDeviceType.aidl

+4 −0
Original line number Diff line number Diff line
@@ -168,4 +168,8 @@ enum AudioDeviceType { 
     * Output into a speaker of a phone / table dock.

     */

    OUT_DOCK = 145,

    /**

     * Output to a broadcast group.

     */

    OUT_BROADCAST = 146,

}

media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceType.aidl

+1 −0
Original line number Diff line number Diff line
@@ -67,4 +67,5 @@ enum AudioDeviceType { 
  OUT_SUBMIX = 143,

  OUT_TELEPHONY_TX = 144,

  OUT_DOCK = 145,

  OUT_BROADCAST = 146,

}

media/java/android/media/AudioDeviceInfo.java

+12 −2
Original line number Diff line number Diff line
@@ -177,6 +177,11 @@ public final class AudioDeviceInfo { 
     */

    public static final int TYPE_HDMI_EARC         = 29;



    /**

     * A device type describing a Bluetooth Low Energy (BLE) broadcast group.

     */

    public static final int TYPE_BLE_BROADCAST   = 30;



    /** @hide */

    @IntDef(flag = false, prefix = "TYPE", value = {

            TYPE_BUILTIN_EARPIECE,
@@ -207,7 +212,8 @@ public final class AudioDeviceInfo { 
            TYPE_REMOTE_SUBMIX,

            TYPE_BLE_HEADSET,

            TYPE_BLE_SPEAKER,

            TYPE_ECHO_REFERENCE}

            TYPE_ECHO_REFERENCE,

            TYPE_BLE_BROADCAST}

    )

    @Retention(RetentionPolicy.SOURCE)

    public @interface AudioDeviceType {}
@@ -264,7 +270,8 @@ public final class AudioDeviceInfo { 
            TYPE_HEARING_AID,

            TYPE_BUILTIN_SPEAKER_SAFE,

            TYPE_BLE_HEADSET,

            TYPE_BLE_SPEAKER}

            TYPE_BLE_SPEAKER,

            TYPE_BLE_BROADCAST}

    )

    @Retention(RetentionPolicy.SOURCE)

    public @interface AudioDeviceTypeOut {}
@@ -296,6 +303,7 @@ public final class AudioDeviceInfo { 
            case TYPE_BUILTIN_SPEAKER_SAFE:

            case TYPE_BLE_HEADSET:

            case TYPE_BLE_SPEAKER:

            case TYPE_BLE_BROADCAST:

                return true;

            default:

                return false;
@@ -636,6 +644,7 @@ public final class AudioDeviceInfo { 
        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_REMOTE_SUBMIX, TYPE_REMOTE_SUBMIX);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_BLE_HEADSET, TYPE_BLE_HEADSET);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_BLE_SPEAKER, TYPE_BLE_SPEAKER);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_BLE_BROADCAST, TYPE_BLE_BROADCAST);



        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BUILTIN_MIC, TYPE_BUILTIN_MIC);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BLUETOOTH_SCO_HEADSET, TYPE_BLUETOOTH_SCO);
@@ -690,6 +699,7 @@ public final class AudioDeviceInfo { 
        EXT_TO_INT_DEVICE_MAPPING.put(TYPE_REMOTE_SUBMIX, AudioSystem.DEVICE_OUT_REMOTE_SUBMIX);

        EXT_TO_INT_DEVICE_MAPPING.put(TYPE_BLE_HEADSET, AudioSystem.DEVICE_OUT_BLE_HEADSET);

        EXT_TO_INT_DEVICE_MAPPING.put(TYPE_BLE_SPEAKER, AudioSystem.DEVICE_OUT_BLE_SPEAKER);

        EXT_TO_INT_DEVICE_MAPPING.put(TYPE_BLE_BROADCAST, AudioSystem.DEVICE_OUT_BLE_BROADCAST);



        // privileges mapping to input device

        EXT_TO_INT_INPUT_DEVICE_MAPPING = new SparseIntArray();

media/java/android/media/AudioDevicePort.java

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ public class AudioDevicePort extends AudioPort { 
     * {@link AudioManager#DEVICE_OUT_BLE_HEADSET}, {@link AudioManager#DEVICE_OUT_BLE_SPEAKER})

     * use the MAC address of the bluetooth device in the form "00:11:22:AA:BB:CC" as reported by

     * {@link BluetoothDevice#getAddress()}.

     * - Deivces that do not have an address will indicate an empty string "".

     * - Bluetooth LE broadcast group ({@link AudioManager#DEVICE_OUT_BLE_BROADCAST} use the group number.

     * - Devices that do not have an address will indicate an empty string "".

     */

    public String address() {

        return mAddress;