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

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

Fix issue 3425342. 

Change the device selection order as follows to enable easier use of
A2DP while the device is docked:
1 - wired Headset
2 - A2DP Headset
3 - SPDIF/HDMI
4 - Dock

Also do not limit notifications volume when on dock.

Change-Id: I55ea6bea9f2d9ff284b54023e541b2788d0f1eb8
parent c77d7b42

services/audioflinger/AudioPolicyManagerBase.cpp

+24 −28
Original line number Diff line number Diff line
@@ -1608,12 +1608,6 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

            if (device) break;

#ifdef WITH_A2DP

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

            if (!isInCall()) {
@@ -1623,6 +1617,12 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
                if (device) break;

            }

#endif

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_EARPIECE;

            if (device == 0) {

                LOGE("getDeviceForStrategy() earpiece device not found");
@@ -1630,12 +1630,6 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
            break;



        case AudioSystem::FORCE_SPEAKER:

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

            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
@@ -1644,6 +1638,12 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
                if (device) break;

            }

#endif

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_SPEAKER;

            if (device == 0) {

                LOGE("getDeviceForStrategy() speaker device not found");
@@ -1672,31 +1672,29 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;

        }

#ifdef WITH_A2DP

        if ((mA2dpOutput != 0) &&

                (strategy != STRATEGY_SONIFICATION || a2dpUsedForSonification())) {

            if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

                device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP;

            }

            if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

                device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES;

            }

            if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

                device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;

            }

#ifdef WITH_A2DP

        if (mA2dpOutput != 0) {

            if (strategy == STRATEGY_SONIFICATION && !a2dpUsedForSonification()) {

                break;

        }

#endif

        if (device2 == 0) {

                device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP;

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

        }

        if (device2 == 0) {

                device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES;

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

        }

        if (device2 == 0) {

                device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;

            }

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

        }

#endif

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_SPEAKER;

        }
@@ -1901,9 +1899,7 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand 
        (AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP |

        AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

        AudioSystem::DEVICE_OUT_WIRED_HEADSET |

        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE |

        AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET |

        AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) &&

        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) &&

        ((getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) ||

         (stream == AudioSystem::SYSTEM)) &&

        streamDesc.mCanBeMuted) {