Merge "audio policy: fix LE audio input device selection." into tm-dev (4408cbe0) · Commits · e / os / android_frameworks_av

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;