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/Effects.cpp b/services/audioflinger/Effects.cpp
index 4cfbdba..3147433 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -2574,13 +2574,8 @@
return false;
}
-bool EffectChain::setVolume_l(uint32_t* left, uint32_t* right, bool force) {
- audio_utils::lock_guard _l(mutex());
- return setVolume_ll(left, right, force);
-}
-
-// setVolume_l() must be called with IAfThreadBase::mutex() and EffectChain::mutex() held
-bool EffectChain::setVolume_ll(uint32_t *left, uint32_t *right, bool force)
+// setVolume_l() must be called with IAfThreadBase::mutex() or EffectChain::mutex() held
+bool EffectChain::setVolume_l(uint32_t *left, uint32_t *right, bool force)
{
uint32_t newLeft = *left;
uint32_t newRight = *right;