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

Commit 08abf1fa authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix bug 2203203 Route STREAM_VOICE_CALL to A2DP when not in call. 

Change-Id: I5581702780308658415dc4ad19fbe409fdc5c368
parent 7f2d3df2

libs/audioflinger/AudioPolicyManagerBase.cpp

+17 −0
Original line number Diff line number Diff line
@@ -1435,6 +1435,15 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;

            if (device) break;

#ifdef WITH_A2DP

            // when not in a phone call, phone strategy should route STREAM_VOICE_CALL to A2DP

            if (mPhoneState != AudioSystem::MODE_IN_CALL) {

                device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP;

                if (device) break;

                device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES;

                if (device) break;

            }

#endif

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_EARPIECE;

            if (device == 0) {

                LOGE("getDeviceForStrategy() earpiece device not found");
@@ -1446,6 +1455,14 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
                device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_CARKIT;

                if (device) break;

            }

#ifdef WITH_A2DP

            // when not in a phone call, phone strategy should route STREAM_VOICE_CALL to

            // A2DP speaker when forcing to speaker output

            if (mPhoneState != AudioSystem::MODE_IN_CALL) {

                device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;

                if (device) break;

            }

#endif

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_SPEAKER;

            if (device == 0) {

                LOGE("getDeviceForStrategy() speaker device not found");