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

Commit c222d6e5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Select correct devices when ENFORCED_AUDIBLE is set" am: 982ecd07 am:... 

Merge "Select correct devices when ENFORCED_AUDIBLE is set" am: 982ecd07 am: 0629cc56 am: d46124d0

Change-Id: Ieb08a772528f1a07dbcfe7b4274dce4f8f4e7909
parents 5b8039a6 d46124d0

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5338,7 +5338,8 @@ DeviceVector AudioPolicyManager::getNewOutputDevices(const sp<SwAudioOutputDescr 
        auto attr = mEngine->getAllAttributesForProductStrategy(productStrategy).front();



        if ((hasVoiceStream(streams) &&

             (isInCall() || mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc))) ||

             (isInCall() || mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) &&

             !isStreamActive(AUDIO_STREAM_ENFORCED_AUDIBLE, 0)) ||

             ((hasStream(streams, AUDIO_STREAM_ALARM) || hasStream(streams, AUDIO_STREAM_ENFORCED_AUDIBLE)) &&

                mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) ||

                outputDesc->isStrategyActive(productStrategy)) {