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

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

Merge "le_audio: Include broadcast profile for codec getter" into main

parents 7f6dc573 ba23ede4

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

+2 −1
Original line number Diff line number Diff line
@@ -896,7 +896,8 @@ public class AudioDeviceInventory { 
            if (event == BtHelper.EVENT_DEVICE_CONFIG_CHANGE) {

                boolean codecChange = false;

                if (btInfo.mProfile == BluetoothProfile.A2DP

                        || btInfo.mProfile == BluetoothProfile.LE_AUDIO) {

                        || btInfo.mProfile == BluetoothProfile.LE_AUDIO

                        || btInfo.mProfile == BluetoothProfile.LE_AUDIO_BROADCAST) {

                    if (di.mDeviceCodecFormat != codec) {

                        di.mDeviceCodecFormat = codec;

                        mConnectedDevices.replace(key, di);

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

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ public class BtHelper { 
        // AUDIO_FORMAT_DEFAULT as native audio policy manager expects a specific audio format

        // only if audio HW module selection based on format is supported for the device type.

        if (!(profile == BluetoothProfile.A2DP

                || (profile == BluetoothProfile.LE_AUDIO && isLeOutput))) {

                || (isLeOutput && ((profile == BluetoothProfile.LE_AUDIO)

                        || (profile == BluetoothProfile.LE_AUDIO_BROADCAST))))) {

            return AudioSystem.AUDIO_FORMAT_DEFAULT;

        }

        @AudioSystem.AudioFormatNativeEnumForBtCodec int codec =