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

Commit 32ebca36 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

AudioPolicyManager: Stop the descriptor when closing its output 

This fixes the case when the SwAudioOutputDescriptor is part of
duplicated output. In this case, APM::closeOutput finds the
duplicated output, deactivates all the clients for all outputs,
then calls 'close' on the descriptor. Since there are no active
clients, closing the descriptor does not stop it, leaving
pending 'active count' in the profile.

Bug: 128362999
Test: steps from b/124415601
Change-Id: I8fa60ef50efa74ca8cf6e3312e1075a9ec9c63f3
parent b893fcd9

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -4828,6 +4828,7 @@ void AudioPolicyManager::closeOutput(audio_io_handle_t output) 
        ALOGW("closeOutput() unknown output %d", output);

        return;

    }

    const bool closingOutputWasActive = closingOutput->isActive();

    mPolicyMixes.closeOutput(closingOutput);



    // look for duplicated outputs connected to the output being removed.
@@ -4867,6 +4868,9 @@ void AudioPolicyManager::closeOutput(audio_io_handle_t output) 
        mpClientInterface->onAudioPatchListUpdate();

    }



    if (closingOutputWasActive) {

        closingOutput->stop();

    }

    closingOutput->close();



    removeOutput(output);