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

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

Merge "audio policy: fix LE audio input device selection." into tm-dev am:... 

Merge "audio policy: fix LE audio input device selection." into tm-dev am: 4408cbe0 am: 0c628c44

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



Change-Id: I3a92e2654d67f7cc9320749b18b6d6724f3c92ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70d76e12 0c628c44

services/audiopolicy/enginedefault/src/Engine.cpp

+3 −3
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
            if (device != nullptr) break;

        }

        device = availableDevices.getFirstExistingDevice({

                AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC});

        break;
@@ -563,7 +563,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
        // 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_WIRED_HEADSET,

                AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC});
@@ -579,7 +579,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
            if (device != nullptr) break;

        }

        device = availableDevices.getFirstExistingDevice({

                AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_BUILTIN_MIC});

        break;