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

Commit 05c2c223 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not include selected output in secondary output list." into main

parents 8c45a7ab 6d66b371

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1492,7 +1492,8 @@ status_t AudioPolicyManager::getOutputForAttr(const audio_attributes_t *attr, 
        for (auto &secondaryMix : secondaryMixes) {

            sp<SwAudioOutputDescriptor> outputDesc = secondaryMix->getOutput();

            if (outputDesc != nullptr &&

                outputDesc->mIoHandle != AUDIO_IO_HANDLE_NONE) {

                outputDesc->mIoHandle != AUDIO_IO_HANDLE_NONE &&

                outputDesc->mIoHandle != *output) {

                secondaryOutputs->push_back(outputDesc->mIoHandle);

                weakSecondaryOutputDescs.push_back(outputDesc);

            }
@@ -7432,7 +7433,8 @@ void AudioPolicyManager::checkSecondaryOutputs() { 
            for (auto &secondaryMix : secondaryMixes) {

                sp<SwAudioOutputDescriptor> outputDesc = secondaryMix->getOutput();

                if (outputDesc != nullptr &&

                    outputDesc->mIoHandle != AUDIO_IO_HANDLE_NONE) {

                    outputDesc->mIoHandle != AUDIO_IO_HANDLE_NONE &&

                    outputDesc != outputDescriptor) {

                    secondaryDescs.push_back(outputDesc);

                }

            }