commit 4ff7a0ebdc6fb3a4ce42cef967fa1fb7dc47281f
author Liana Kazanova <lkazanova@google.com> Tue Jan 16 21:59:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 16 21:59:49 2024 +0000
tree 9c4ba8f6f93fe5a7dd38012fee4274d004cc0d97
parent a4cc45f86037ef7e7832624f9bc7ab9e84556d15

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

services/audioflinger/Effects.h

diff --git a/services/audioflinger/Effects.h b/services/audioflinger/Effects.h
index 1097b56..8583d47 100644
--- a/services/audioflinger/Effects.h
+++ b/services/audioflinger/Effects.h
@@ -401,7 +401,7 @@
 public:
     EffectChain(const sp<IAfThreadBase>& thread, audio_session_t sessionId);
 
-    void process_l() final REQUIRES(audio_utils::ThreadBase_Mutex);
+    void process_l() final;
 
     audio_utils::mutex& mutex() const final { return mMutex; }
 
@@ -423,11 +423,8 @@
     std::vector<int> getEffectIds() const final;
     // FIXME use float to improve the dynamic range
 
-    bool setVolume_l(uint32_t* left, uint32_t* right, bool force = false) final
-            REQUIRES(audio_utils::ThreadBase_Mutex) EXCLUDES_EffectChain_Mutex;
-    bool setVolume_ll(uint32_t* left, uint32_t* right, bool force = false) final
-            REQUIRES(audio_utils::ThreadBase_Mutex, mutex());
-    void resetVolume_l() final REQUIRES(audio_utils::ThreadBase_Mutex);
+    bool setVolume_l(uint32_t *left, uint32_t *right, bool force = false) final;
+    void resetVolume_l() final;
     void setDevices_l(const AudioDeviceTypeAddrVector &devices) final;
     void setInputDevice_l(const AudioDeviceTypeAddr &device) final;
     void setMode_l(audio_mode_t mode) final;
@@ -573,7 +570,7 @@
         // check if effects should be suspended/restored when a given effect is enable/disabled
         void checkSuspendOnEffectEnabled(const sp<IAfEffectBase>& effect,
                               bool enabled, bool threadLocked) override;
-        void resetVolume() override REQUIRES(audio_utils::ThreadBase_Mutex);
+        void resetVolume() override;
         product_strategy_t strategy() const override;
         int32_t activeTrackCnt() const override;
         void onEffectEnable(const sp<IAfEffectBase>& effect) override;
@@ -748,7 +745,7 @@
 
         void checkSuspendOnEffectEnabled(const sp<IAfEffectBase>& effect __unused,
                               bool enabled __unused, bool threadLocked __unused) override {}
-        void resetVolume() override REQUIRES(audio_utils::ThreadBase_Mutex) {}
+        void resetVolume() override {}
         product_strategy_t strategy() const override  { return static_cast<product_strategy_t>(0); }
         int32_t activeTrackCnt() const override { return 0; }
         void onEffectEnable(const sp<IAfEffectBase>& effect __unused) override;