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

Commit eb8c6eab authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audio: add Bluetooth LE Audio broadcast device" am: 80dfa914 am: a9cc7d1a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1978308

Change-Id: If5efbd0fedd228cde6ed24811e1f2231d25bb8a2
parents 7ed25ef8 a9cc7d1a

services/audiopolicy/common/include/Volume.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,7 @@ public: 
        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:

        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:

        case AUDIO_DEVICE_OUT_USB_HEADSET:

        case AUDIO_DEVICE_OUT_USB_HEADSET:

        case AUDIO_DEVICE_OUT_BLE_HEADSET:

        case AUDIO_DEVICE_OUT_BLE_HEADSET:

        case AUDIO_DEVICE_OUT_BLE_BROADCAST:

            return DEVICE_CATEGORY_HEADSET;

            return DEVICE_CATEGORY_HEADSET;

        case AUDIO_DEVICE_OUT_HEARING_AID:

        case AUDIO_DEVICE_OUT_HEARING_AID:

            return DEVICE_CATEGORY_HEARING_AID;

            return DEVICE_CATEGORY_HEARING_AID;

services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ device_out_group_t LastRemovableMediaDevices::getDeviceOutGroup(audio_devices_t 
    case AUDIO_DEVICE_OUT_HEARING_AID:

    case AUDIO_DEVICE_OUT_HEARING_AID:

    case AUDIO_DEVICE_OUT_BLE_HEADSET:

    case AUDIO_DEVICE_OUT_BLE_HEADSET:

    case AUDIO_DEVICE_OUT_BLE_SPEAKER:

    case AUDIO_DEVICE_OUT_BLE_SPEAKER:

    case AUDIO_DEVICE_OUT_BLE_BROADCAST:

        return GROUP_BT_A2DP;

        return GROUP_BT_A2DP;

    default:

    default:

        return GROUP_NONE;

        return GROUP_NONE;