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

Commit 74784041 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "audio policy: fix getOutputFromId and getInputFromId" into pie-gsi

parents 16c3e05e a1bf1028

services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp

+4 −5
Original line number Original line Diff line number Diff line
@@ -313,14 +313,13 @@ bool AudioInputCollection::isSourceActive(audio_source_t source) const 




sp<AudioInputDescriptor> AudioInputCollection::getInputFromId(audio_port_handle_t id) const

sp<AudioInputDescriptor> AudioInputCollection::getInputFromId(audio_port_handle_t id) const

{

{

    sp<AudioInputDescriptor> inputDesc = NULL;

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

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

        inputDesc = valueAt(i);

        const sp<AudioInputDescriptor> inputDescriptor = valueAt(i);

        if (inputDesc->getId() == id) {

        if (inputDescriptor->getId() == id) {

            break;

            return inputDescriptor;

        }

        }

    }

    }

    return inputDesc;

    return NULL;

}

}





uint32_t AudioInputCollection::activeInputsCountOnDevices(audio_devices_t devices) const

uint32_t AudioInputCollection::activeInputsCountOnDevices(audio_devices_t devices) const

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -681,14 +681,13 @@ sp<SwAudioOutputDescriptor> SwAudioOutputCollection::getPrimaryOutput() const 




sp<SwAudioOutputDescriptor> SwAudioOutputCollection::getOutputFromId(audio_port_handle_t id) const

sp<SwAudioOutputDescriptor> SwAudioOutputCollection::getOutputFromId(audio_port_handle_t id) const

{

{

    sp<SwAudioOutputDescriptor> outputDesc = NULL;

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

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

        outputDesc = valueAt(i);

        const sp<SwAudioOutputDescriptor> outputDesc = valueAt(i);

        if (outputDesc->getId() == id) {

        if (outputDesc->getId() == id) {

            break;

            return outputDesc;

        }

        }

    }

    }

    return outputDesc;

    return NULL;

}

}





bool SwAudioOutputCollection::isAnyOutputActive(audio_stream_type_t streamToIgnore) const

bool SwAudioOutputCollection::isAnyOutputActive(audio_stream_type_t streamToIgnore) const