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

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

Merge "Do not include selected output in secondary output list." into main am: 05c2c223 

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



Change-Id: I47e644462fce44238da17893c5351df946bef85f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7b90545 05c2c223

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

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

            }
@@ -7565,7 +7566,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);

                }

            }