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

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

Merge "Fix issue 3425342."

parents b3103093 ee5d4b8f

services/audioflinger/AudioPolicyManagerBase.cpp

+24 −28
Original line number Diff line number Diff line
@@ -1622,12 +1622,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()) {
@@ -1637,6 +1631,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");
@@ -1644,12 +1644,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
@@ -1658,6 +1652,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");
@@ -1686,31 +1686,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;

        }
@@ -1915,9 +1913,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) {