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

Commit 18b46679 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev

parents b05eeaed 7e1139c0

services/audioflinger/Effects.cpp

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ status_t AudioFlinger::EffectModule::setDevice(audio_devices_t device) 
        return mStatus;

    }

    status_t status = NO_ERROR;

    if (device && (mDescriptor.flags & EFFECT_FLAG_DEVICE_MASK) == EFFECT_FLAG_DEVICE_IND) {

    if ((mDescriptor.flags & EFFECT_FLAG_DEVICE_MASK) == EFFECT_FLAG_DEVICE_IND) {

        status_t cmdStatus;

        uint32_t size = sizeof(status_t);

        uint32_t cmd = audio_is_output_devices(device) ? EFFECT_CMD_SET_DEVICE :

services/audioflinger/Threads.cpp

+5 −3
Original line number Diff line number Diff line
@@ -2992,11 +2992,13 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l() 


            // forward device change to effects that have requested to be

            // aware of attached audio device.

            if (value != AUDIO_DEVICE_NONE) {

                mOutDevice = value;

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

                    mEffectChains[i]->setDevice_l(mOutDevice);

                }

            }

        }



        if (status == NO_ERROR) {

            status = mOutput->stream->common.set_parameters(&mOutput->stream->common,