commit a0de6c6e754605050142057e8dca7820c6c48bf9
author zhanglina1 <zhanglina1@xiaomi.corp-partner.google.com> Thu Nov 30 15:18:34 2023 +0800
committer Andy Hung <hunga@google.com> Fri Dec 01 18:31:38 2023 -0800
tree 2ff671f06fcadee1d838206c2ce3b27d0aacc11a
parent 3e2768a638ed08858ea9a4f71384454b1dc1e588

Increase lock scope to protect variables

Ensure that the variable is locked throughout its lifetime.

Test: atest android.media.audio.cts.AudioEffectTest android.media.audio.cts.AudioPreProcessingTest android.media.audio.cts.BassBoostTest android.media.audio.cts.EnvReverbTest android.media.audio.cts.EqualizerTest android.media.audio.cts.LoudnessEnhancerTest android.media.audio.cts.PresetReverbTest android.media.audio.cts.VirtualizerTest android.media.audio.cts.VisualizerTest
Change-Id: I0bcaaa43c24df2afee1cbef278231ec94833c076
Signed-off-by: zhanglina1 <zhanglina1@xiaomi.corp-partner.google.com>

media/libaudioclient/AudioEffect.cpp

diff --git a/media/libaudioclient/AudioEffect.cpp b/media/libaudioclient/AudioEffect.cpp
index 2870c4c..a7adfbd 100644
--- a/media/libaudioclient/AudioEffect.cpp
+++ b/media/libaudioclient/AudioEffect.cpp
@@ -366,14 +366,15 @@
         return mStatus;
     }
 
+    std::unique_lock ul(mLock, std::defer_lock);
     if (cmdCode == EFFECT_CMD_ENABLE || cmdCode == EFFECT_CMD_DISABLE) {
+        ul.lock();
         if (mEnabled == (cmdCode == EFFECT_CMD_ENABLE)) {
             return NO_ERROR;
         }
         if (replySize == nullptr || *replySize != sizeof(status_t) || replyData == nullptr) {
             return BAD_VALUE;
         }
-        mLock.lock();
     }
 
     std::vector<uint8_t> data;
@@ -398,7 +399,6 @@
         if (status == NO_ERROR) {
             mEnabled = (cmdCode == EFFECT_CMD_ENABLE);
         }
-        mLock.unlock();
     }
 
     return status;