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

Commit 80df98d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove cleanUpEffectsForIo."

parents 677b3bf2 1159384b

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+0 −14
Original line number Diff line number Diff line
@@ -2787,16 +2787,6 @@ status_t AudioPolicyManager::unregisterEffect(int id) 
    return mEffects.unregisterEffect(id);

}



void AudioPolicyManager::cleanUpEffectsForIo(audio_io_handle_t io)

{

    EffectDescriptorCollection effects = mEffects.getEffectsForIo(io);

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

        ALOGW("%s removing stale effect %s, id %d on closed IO %d",

              __func__, effects.valueAt(i)->mDesc.name, effects.keyAt(i), io);

        unregisterEffect(effects.keyAt(i));

    }

}



status_t AudioPolicyManager::setEffectEnabled(int id, bool enabled)

{

    sp<EffectDescriptor> effect = mEffects.getEffect(id);
@@ -5043,8 +5033,6 @@ void AudioPolicyManager::closeOutput(audio_io_handle_t output) 
            setMsdPatch();

        }

    }



    cleanUpEffectsForIo(output);

}



void AudioPolicyManager::closeInput(audio_io_handle_t input)
@@ -5076,8 +5064,6 @@ void AudioPolicyManager::closeInput(audio_io_handle_t input) 
            mInputs.activeInputsCountOnDevices(primaryInputDevices) == 0) {

        mpClientInterface->setSoundTriggerCaptureState(false);

    }



    cleanUpEffectsForIo(input);

}



SortedVector<audio_io_handle_t> AudioPolicyManager::getOutputsForDevices(

services/audiopolicy/managerdefault/AudioPolicyManager.h

+0 −2
Original line number Diff line number Diff line
@@ -886,8 +886,6 @@ private: 
                int delayMs,

                uid_t uid,

                sp<AudioPatch> *patchDescPtr);



        void cleanUpEffectsForIo(audio_io_handle_t io);

};



};