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

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

Merge "Change audio routing policy for HDMI"

parents 00502849 f3a8d32f

services/audioflinger/AudioPolicyManagerBase.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1641,19 +1641,19 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
        // FALL THROUGH



    case STRATEGY_MEDIA: {

        uint32_t device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADPHONE;

        }

        uint32_t device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADPHONE;

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;

        }

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL;

        }

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

        }

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

        }

#ifdef WITH_A2DP

        if (mA2dpOutput != 0) {

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