| commit | bfa5edc2bc3640abb1c8032558da4c27f4b9913b | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Feb 09 18:58:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 09 18:58:36 2022 +0000 |
| tree | c8d9747b9c2cad0c4a8230491eeb3c42e731b01c | |
| parent | c4ccacf33535149f95bb8526a183d455f282cec6 [diff] | |
| parent | eb8c6eab3debc399f0ab43d201f9fe0341aa3c02 [diff] |
Merge "audio: add Bluetooth LE Audio broadcast device" am: 80dfa91461 am: a9cc7d1a84 am: eb8c6eab3d Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1978308 Change-Id: Iecd4f78bdda499e56f28f6dc80c2d0276d29687a
diff --git a/services/audiopolicy/common/include/Volume.h b/services/audiopolicy/common/include/Volume.h index 736f8b2..f0636a0 100644 --- a/services/audiopolicy/common/include/Volume.h +++ b/services/audiopolicy/common/include/Volume.h
@@ -127,6 +127,7 @@ case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES: case AUDIO_DEVICE_OUT_USB_HEADSET: case AUDIO_DEVICE_OUT_BLE_HEADSET: + case AUDIO_DEVICE_OUT_BLE_BROADCAST: return DEVICE_CATEGORY_HEADSET; case AUDIO_DEVICE_OUT_HEARING_AID: return DEVICE_CATEGORY_HEARING_AID;
diff --git a/services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp b/services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp index b3f8947..06cc799 100644 --- a/services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp +++ b/services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp
@@ -85,6 +85,7 @@ case AUDIO_DEVICE_OUT_HEARING_AID: case AUDIO_DEVICE_OUT_BLE_HEADSET: case AUDIO_DEVICE_OUT_BLE_SPEAKER: + case AUDIO_DEVICE_OUT_BLE_BROADCAST: return GROUP_BT_A2DP; default: return GROUP_NONE;