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

Commit cd71a69d authored by Eric Laurent's avatar Eric Laurent
Browse files

audio: Force audio to Speaker if requested during VOIP call 

getDeviceForStrategy is returning AUDIO_DEVICE_OUT_USB even
when setForceUse is called with Speaker during VOIP call.
Actual Intention is to route audio for phone strategy to USB
device even after setForceUse is called with Speaker when not
in voice call. It is supposed to exclude VOIP call too

Added additional check for MODE_IN_COMMUNICATION so that
it returns SPEAKER when setForceUse is called with speaker

Bug: 18758599

Change-Id: I1c51128cc1c7bfce1cf6f1fde60b428d3a9379fc
parent 8975220e

services/audiopolicy/AudioPolicyManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -4566,7 +4566,7 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate 
                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;

                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;

                if (device) break;

                if (device) break;

            }

            }

            if (mPhoneState != AUDIO_MODE_IN_CALL) {

            if (!isInCall()) {

                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_USB_ACCESSORY;

                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_USB_ACCESSORY;

                if (device) break;

                if (device) break;

                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_USB_DEVICE;

                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_USB_DEVICE;