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

Commit cf5a8323 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Revert "audio policy: invalidate tracks when selected devices become unreachable" 

This reverts commit 6f9952e4.

Reason for revert: temporary revert to allow landing aosp/3238754.

Change-Id: Ib1dcd147d47334c62dbc50cf0a2c781b47005993
parent 6f9952e4

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+9 −16
Original line number Diff line number Diff line
@@ -7385,36 +7385,29 @@ void AudioPolicyManager::checkOutputForAttributes(const audio_attributes_t &attr 
    std::vector<sp<SwAudioOutputDescriptor>> invalidatedOutputs;

    // take into account dynamic audio policies related changes: if a client is now associated

    // to a different policy mix than at creation time, invalidate corresponding stream

    // invalidate clients on outputs that do not support all the newly selected devices for the

    // strategy

    for (size_t i = 0; i < mPreviousOutputs.size(); i++) {

        const sp<SwAudioOutputDescriptor>& desc = mPreviousOutputs.valueAt(i);

        if (desc->isDuplicated() || desc->getClientCount() == 0) {

        if (desc->isDuplicated()) {

            continue;

        }



        for (const sp<TrackClientDescriptor>& client : desc->getClientIterable()) {

            if (mEngine->getProductStrategyForAttributes(client->attributes()) != psId) {

                continue;

            }

            if (!desc->supportsAllDevices(newDevices)) {

                invalidatedOutputs.push_back(desc);

                break;

            }

            sp<AudioPolicyMix> primaryMix;

            status_t status = mPolicyMixes.getOutputForAttr(client->attributes(), client->config(),

                    client->uid(), client->session(), client->flags(), mAvailableOutputDevices,

                    nullptr /* requestedDevice */, primaryMix, nullptr /* secondaryMixes */,

                    unneededUsePrimaryOutputFromPolicyMixes);

            if (status == OK) {

            if (status != OK) {

                continue;

            }

            if ((client->getPrimaryMix() && client->getPrimaryMix() != primaryMix)

                    || client->hasLostPrimaryMix()) {

                if (desc->isStrategyActive(psId) && maxLatency < desc->latency()) {

                    maxLatency = desc->latency();

                }

                invalidatedOutputs.push_back(desc);

                    break;

                }

            }

        }

    }