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

Commit eb9419fb authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioDeviceInventory: fix LE Audio Broadcast device name. 

Make sure a non empty device name is provided for LE Audio broadcast
devices as the this is needed for proper MediaRouter operation.
The device name is not provided by th eBT stack for broadcast devices.

Bug: 290701463
Test: make
Change-Id: Ibe34660d589b18a1801cb51efd87822c33c822b0
parent 44a5fb63

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+8 −2
Original line number Diff line number Diff line
@@ -2070,12 +2070,18 @@ public class AudioDeviceInventory { 
    @GuardedBy("mDevicesLock")

    private void makeLeAudioDeviceAvailable(

            AudioDeviceBroker.BtDeviceInfo btInfo, int streamType, String eventSource) {

        final String address = btInfo.mDevice.getAddress();

        final String name = BtHelper.getName(btInfo.mDevice);

        final int volumeIndex = btInfo.mVolume == -1 ? -1 : btInfo.mVolume * 10;

        final int device = btInfo.mAudioSystemDevice;



        if (device != AudioSystem.DEVICE_NONE) {

            final String address = btInfo.mDevice.getAddress();

            String name = BtHelper.getName(btInfo.mDevice);



            // The BT Stack does not provide a name for LE Broadcast devices

            if (device == AudioSystem.DEVICE_OUT_BLE_BROADCAST && name.equals("")) {

                name = "Broadcast";

            }



            /* Audio Policy sees Le Audio similar to A2DP. Let's make sure

             * AUDIO_POLICY_FORCE_NO_BT_A2DP is not set

             */