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

Commit cc58a6bd authored by Carter Hsu's avatar Carter Hsu
Browse files

Revert "audio: prefer STRATEGY_SONIFICATION when ringotne is active" 

This reverts commit f20f2d4d.

Reason for revert: <regression on b/192918626>

Bug: 191220137
Bug: 192918626
Change-Id: I57f65d81e03e2f4d565acef774128006a8ff30c7
parent f20f2d4d

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -5847,12 +5847,11 @@ DeviceVector AudioPolicyManager::getNewOutputDevices(const sp<SwAudioOutputDescr 
        // With low-latency playing on speaker, music on WFD, when the first low-latency

        // output is stopped, getNewOutputDevices checks for a product strategy

        // from the list, as STRATEGY_SONIFICATION comes prior to STRATEGY_MEDIA.

        // If an ALARM, RING or ENFORCED_AUDIBLE stream is supported by the product strategy,

        // If an ALARM or ENFORCED_AUDIBLE stream is supported by the product strategy,

        // devices are returned for STRATEGY_SONIFICATION without checking whether the

        // stream is associated to the output descriptor.

        if (doGetOutputDevicesForVoice() || outputDesc->isStrategyActive(productStrategy) ||

               ((hasStreamActive(AUDIO_STREAM_ALARM) ||

                hasStreamActive(AUDIO_STREAM_RING) ||

                hasStreamActive(AUDIO_STREAM_ENFORCED_AUDIBLE)) &&

                mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc))) {

            // Retrieval of devices for voice DL is done on primary output profile, cannot