commit d125e40c37c686efed8be542eb0a37d7ff9af3d1
author Shunkai Yao <yaoshunkai@google.com> Sat Jan 20 03:19:06 2024 +0000
committer Shunkai Yao <yaoshunkai@google.com> Wed Jan 24 05:50:04 2024 +0000
tree d7a1b38952bbd53c2c031f3381476cf40b696720
parent f4847650dd2fa7f99d8f0fe07ff47d46d3b96d18

Add thread safe annotation in audio flinger effects

Bug: 315995877
Test: atest AudioTrackTest AudioRecordTest audioeffect_tests
Change-Id: I90406c48660aef25ab4402a70a2a45deb6651335

services/audioflinger/Threads.h

diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index a8e4339..a6888c0 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -437,9 +437,10 @@
                 // integrity of the chains during the process.
                 // Also sets the parameter 'effectChains' to current value of mEffectChains.
     void lockEffectChains_l(Vector<sp<IAfEffectChain>>& effectChains) final
-            REQUIRES(mutex()) EXCLUDES_EffectChain_Mutex;
+            REQUIRES(audio_utils::ThreadBase_Mutex) ACQUIRE(audio_utils::EffectChain_Mutex);
                 // unlock effect chains after process
-    void unlockEffectChains(const Vector<sp<IAfEffectChain>>& effectChains) final;
+    void unlockEffectChains(const Vector<sp<IAfEffectChain>>& effectChains) final
+            RELEASE(audio_utils::EffectChain_Mutex);
                 // get a copy of mEffectChains vector
     Vector<sp<IAfEffectChain>> getEffectChains_l() const final REQUIRES(mutex()) {
         return mEffectChains;