diff options
| author | Cheney Ni <cheneyni@google.com> | 2019-02-24 04:05:17 +0800 |
|---|---|---|
| committer | Hansong Zhang <hsz@google.com> | 2019-02-27 13:58:03 -0800 |
| commit | e53664aeef88770b0b7ad59578fc2f01b086dff6 (patch) | |
| tree | a6c2610c5ac8ddfe168abd9859ccdde55abffc45 /audio_policy_configuration_a2dp_offload_disabled.xml | |
| parent | afee43a7dcdf5098def12eaaee6e84062fc4dc91 (diff) | |
| download | bonito-e53664aeef88770b0b7ad59578fc2f01b086dff6.tar.gz | |
Reland BluetoothAudio HAL: flip to be enabled by default on Bonito
Swap audio XML files, and supports following scenarios:
1) (default) audio_policy_configuration.xml
Using BluetoothAudio HAL and A2DP offload
2) audio_policy_configuration_a2dp_offload_disabled.xml
Using BluetoothAudio HAL only when A2DP offload is disabled
3) audio_policy_configuration_bluetooth_legacy_hal.xml
No BluetoothAudio HAL nor A2DP offload
Bug: 126304229
Test: Switch BluetoothAudio HAL and A2DP offload manully
(cherry picked from commit e75cd66b4e4d4ef92e3f7d763067bdac78df6cc8)
Change-Id: Ic2e4c5b6a1e209abfd4233c73c336f3f37c90326
Diffstat (limited to 'audio_policy_configuration_a2dp_offload_disabled.xml')
| -rw-r--r-- | audio_policy_configuration_a2dp_offload_disabled.xml | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/audio_policy_configuration_a2dp_offload_disabled.xml b/audio_policy_configuration_a2dp_offload_disabled.xml index b45b5901..dcbcd555 100644 --- a/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio_policy_configuration_a2dp_offload_disabled.xml @@ -112,6 +112,12 @@ </devicePort> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> </devicePort> + <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink"> + </devicePort> + <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink"> + </devicePort> + <devicePort tagName="Line Out" type="AUDIO_DEVICE_OUT_LINE" role="sink"> + </devicePort> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> </devicePort> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> @@ -128,6 +134,8 @@ </devicePort> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> </devicePort> + <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source"> + </devicePort> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> </devicePort> <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source"> @@ -145,6 +153,12 @@ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> <route type="mix" sink="Speaker Safe" sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + <route type="mix" sink="Wired Headset" + sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + <route type="mix" sink="Wired Headphones" + sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + <route type="mix" sink="Line Out" + sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> <route type="mix" sink="BT SCO" sources="primary output,raw,deep_buffer,voip_rx"/> <route type="mix" sink="BT SCO Headset" @@ -158,21 +172,21 @@ <route type="mix" sink="Telephony Tx" sources="voice_tx,incall_music_uplink"/> <route type="mix" sink="primary input" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voice_rx" sources="Telephony Rx"/> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> <route type="mix" sink="mmap_no_irq_in" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voip_tx" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> </routes> </module> - <!-- A2DP Audio HAL --> - <xi:include href="a2dp_audio_policy_configuration.xml"/> + <!-- A2DP Input Audio HAL --> + <xi:include href="a2dp_in_audio_policy_configuration.xml"/> <!-- Usb Audio HAL --> <module name="usb" halVersion="2.0"> @@ -197,8 +211,8 @@ <!-- Remote Submix Audio HAL --> <xi:include href="r_submix_audio_policy_configuration.xml"/> - <!-- Hearing aid Audio HAL --> - <xi:include href="hearing_aid_audio_policy_configuration.xml"/> + <!-- Bluetooth Audio HAL --> + <xi:include href="bluetooth_audio_policy_configuration.xml"/> </modules> |