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

Commit a7c2bafa authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 2065ec8c 6838cdad

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1559,7 +1559,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);

            }
@@ -7655,7 +7656,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);

                }

            }