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/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 67a0bd1..244a262 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5497,7 +5497,6 @@
     if (masterMute) {
         masterVolume = 0;
     }
-
     // Delegate master volume control to effect in output mix effect chain if needed
     sp<IAfEffectChain> chain = getEffectChain_l(AUDIO_SESSION_OUTPUT_MIX);
     if (chain != 0) {
@@ -5837,7 +5836,7 @@
 
             mixedTracks++;
 
-            // track->mainBuffer() != mSinkBuffer and mMixerBuffer means
+            // track->mainBuffer() != mSinkBuffer or mMixerBuffer means
             // there is an effect chain connected to the track
             chain.clear();
             if (track->mainBuffer() != mSinkBuffer &&