Revert "EffectChain setVolume_l with EffectChainmutex held"
This reverts commit a4cc45f86037ef7e7832624f9bc7ab9e84556d15.
Reason for revert: Potential culprit for b/320532190 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Ic4d90b958b37e331d9cbdd11c53ebb6e497ef499
diff --git a/services/audioflinger/IAfEffect.h b/services/audioflinger/IAfEffect.h
index bc01a75..56076a3 100644
--- a/services/audioflinger/IAfEffect.h
+++ b/services/audioflinger/IAfEffect.h
@@ -241,10 +241,7 @@
virtual sp<IAfEffectModule> getEffectFromId_l(int id) const = 0;
virtual sp<IAfEffectModule> getEffectFromType_l(const effect_uuid_t *type) const = 0;
virtual std::vector<int> getEffectIds() const = 0;
- virtual bool setVolume_l(uint32_t* left, uint32_t* right, bool force = false)
- REQUIRES(audio_utils::ThreadBase_Mutex) EXCLUDES_EffectChain_Mutex = 0;
- virtual bool setVolume_ll(uint32_t* left, uint32_t* right, bool force = false)
- REQUIRES(audio_utils::ThreadBase_Mutex, audio_utils::EffectChain_Mutex) = 0;
+ virtual bool setVolume_l(uint32_t *left, uint32_t *right, bool force = false) = 0;
virtual void resetVolume_l() = 0;
virtual void setDevices_l(const AudioDeviceTypeAddrVector &devices) = 0;
virtual void setInputDevice_l(const AudioDeviceTypeAddr &device) = 0;