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

Commit fe472e29 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix routing not happening after change in output device list 

If an output stream is active while rerouting rules are installed
  and recording starts, the list of outputs is not updated and
  therefore the stream is not rerouted to the new virtual device.
The fix consists in also taking into account all the policy-related
  outputs when evaluating the before and after list of outputs
  following a connection state event.

Bug 18736417

Change-Id: I6697976b3f89e2c0995e888e9046a2273361bb97
parent 97bb33f5

services/audiopolicy/AudioPolicyManager.cpp

+18 −0
Original line number Original line Diff line number Diff line
@@ -4055,6 +4055,24 @@ void AudioPolicyManager::checkOutputForStrategy(routing_strategy strategy) 
    SortedVector<audio_io_handle_t> srcOutputs = getOutputsForDevice(oldDevice, mPreviousOutputs);

    SortedVector<audio_io_handle_t> srcOutputs = getOutputsForDevice(oldDevice, mPreviousOutputs);

    SortedVector<audio_io_handle_t> dstOutputs = getOutputsForDevice(newDevice, mOutputs);

    SortedVector<audio_io_handle_t> dstOutputs = getOutputsForDevice(newDevice, mOutputs);





    // also take into account external policy-related changes: add all outputs which are

    // associated with policies in the "before" and "after" output vectors

    ALOGVV("checkOutputForStrategy(): policy related outputs");

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

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

        if (desc != 0 && desc->mPolicyMix != NULL) {

            srcOutputs.add(desc->mIoHandle);

            ALOGVV(" previous outputs: adding %d", desc->mIoHandle);

        }

    }

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

        const sp<AudioOutputDescriptor> desc = mOutputs.valueAt(i);

        if (desc != 0 && desc->mPolicyMix != NULL) {

            dstOutputs.add(desc->mIoHandle);

            ALOGVV(" new outputs: adding %d", desc->mIoHandle);

        }

    }



    if (!vectorsEqual(srcOutputs,dstOutputs)) {

    if (!vectorsEqual(srcOutputs,dstOutputs)) {

        ALOGV("checkOutputForStrategy() strategy %d, moving from output %d to output %d",

        ALOGV("checkOutputForStrategy() strategy %d, moving from output %d to output %d",

              strategy, srcOutputs[0], dstOutputs[0]);

              strategy, srcOutputs[0], dstOutputs[0]);