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

Commit 11fe1acb authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "APM: Don't copy invalid gain value"

parents 0443ba44 60d15624

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

+4 −2
Original line number Diff line number Diff line
@@ -911,9 +911,11 @@ void AudioPortConfig::toAudioPortConfig(struct audio_port_config *dstConfig, 
    } else {

        dstConfig->format = AUDIO_FORMAT_INVALID;

    }

    if (dstConfig->config_mask & AUDIO_PORT_CONFIG_GAIN) {

    sp<AudioPort> audioport = getAudioPort();

    if ((dstConfig->config_mask & AUDIO_PORT_CONFIG_GAIN) && audioport != NULL) {

        dstConfig->gain = mGain;

        if ((srcConfig != NULL) && (srcConfig->config_mask & AUDIO_PORT_CONFIG_GAIN)) {

        if ((srcConfig != NULL) && (srcConfig->config_mask & AUDIO_PORT_CONFIG_GAIN)

                && audioport->checkGain(&srcConfig->gain, srcConfig->gain.index) == OK) {

            dstConfig->gain = srcConfig->gain;

        }

    } else {