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

Commit 302820b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Select correct device for ENFORCE_AUDIBLE" am: 41c7badd am: 13f96529 am: 3c19f958 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1926479

Change-Id: I101c0346a7014bf8a494faa741ffd63b56957f35
parents a9a4db39 3c19f958

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -6094,7 +6094,8 @@ DeviceVector AudioPolicyManager::getNewOutputDevices(const sp<SwAudioOutputDescr 
            return hasVoiceStream(streams) && (outputDesc == mPrimaryOutput ||

                outputDesc->isActive(toVolumeSource(AUDIO_STREAM_VOICE_CALL))) &&

                (isInCall() ||

                 mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc));

                 mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) &&

                !isStreamActive(AUDIO_STREAM_ENFORCED_AUDIBLE, 0);

        };



        // With low-latency playing on speaker, music on WFD, when the first low-latency