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

Commit 0c07db6e authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: change default in call routing for line out device" into nyc-dev

parents ee4804a7 a0b18ce8

services/audiopolicy/enginedefault/src/Engine.cpp

+2 −2
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const 
            if (device) break;

            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_WIRED_HEADSET;

            if (device) break;

            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_LINE;

            if (device) break;

            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_USB_DEVICE;

            if (device) break;

            if (!isInCall()) {
@@ -391,8 +393,6 @@ audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const 
                device = availableOutputDevicesType & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET;

                if (device) break;

            }

            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_LINE;

            if (device) break;

            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER;

            if (device) break;

            device = mApmObserver->getDefaultOutputDevice()->type();