From f3a6cafa0e4dc92b450ad5c89c32e77dfd3eed2a Mon Sep 17 00:00:00 2001 From: Kinbay_Wu Date: Thu, 22 Aug 2024 11:18:33 +0800 Subject: [PATCH] [BPM-36179] [MT-1977] Fix the ATT command sent twice when using YouTube Voice Search Signed-off-by: Kinbay_Wu --- .../audiopolicy/enginedefault/src/Engine.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp index 1f8f082d8d..787bbdbc30 100644 --- a/services/audiopolicy/enginedefault/src/Engine.cpp +++ b/services/audiopolicy/enginedefault/src/Engine.cpp @@ -541,8 +541,22 @@ sp Engine::getDeviceForInputSource(audio_source_t inputSource) break; case AUDIO_SOURCE_VOICE_RECOGNITION: - case AUDIO_SOURCE_VOICE_RECOGNITION_NUGU: //Vas add for NUGU support;River 2019/08/06 case AUDIO_SOURCE_UNPROCESSED: + if (audio_is_bluetooth_out_sco_device(commDeviceType)) { + device = availableDevices.getDevice( + AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, String8(""), AUDIO_FORMAT_DEFAULT); + if (device != nullptr) break; + } + // we need to make BLUETOOTH_BLE has higher priority than BUILTIN_MIC, + // because sometimes user want to do voice search by bt remote + // even if BUILDIN_MIC is available. + device = availableDevices.getFirstExistingDevice({ + AUDIO_DEVICE_IN_BLE_HEADSET, + AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE, + AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC, + AUDIO_DEVICE_IN_WIRED_HEADSET}); + break; + case AUDIO_SOURCE_VOICE_RECOGNITION_NUGU: //Vas add for NUGU support;River 2019/08/06 if (audio_is_bluetooth_out_sco_device(commDeviceType)) { device = availableDevices.getDevice( AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, String8(""), AUDIO_FORMAT_DEFAULT); -- 2.25.1