commit 12629837f73f3cf07973d66e4866184bcd1a7aac
author Shunkai Yao <yaoshunkai@google.com> Fri Jul 12 21:21:42 2024 +0000
committer Shunkai Yao <yaoshunkai@google.com> Fri Jul 12 22:12:45 2024 +0000
tree 7edd1866b2ec5ed891862fe6ca4074ed1957969f
parent 501488294fae9abaee120104c4652c53d8948190

Update mutex annotation for debug information and setVolumeInternal

Bug: 315995877
Test: atest CtsMediaAudioTestCases
Change-Id: Id77ccb0b03466b92c4caa4d00c2a2ea668df8c0e

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 0d35c82..459f0fc 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1373,12 +1373,12 @@
             ((mDescriptor.flags & EFFECT_FLAG_VOLUME_MASK) == EFFECT_FLAG_VOLUME_CTRL ||
              (mDescriptor.flags & EFFECT_FLAG_VOLUME_MASK) == EFFECT_FLAG_VOLUME_IND ||
              (mDescriptor.flags & EFFECT_FLAG_VOLUME_MASK) == EFFECT_FLAG_VOLUME_MONITOR)) {
-        status = setVolumeInternal(left, right, controller);
+        status = setVolumeInternal_ll(left, right, controller);
     }
     return status;
 }
 
-status_t EffectModule::setVolumeInternal(
+status_t EffectModule::setVolumeInternal_ll(
         uint32_t *left, uint32_t *right, bool controller) {
     if (mVolume.has_value() && *left == mVolume.value()[0] && *right == mVolume.value()[1] &&
             !controller) {