commit 1040da54c1466260b3d3749123465ef0c7736fbc
author Andy Hung <hunga@google.com> Wed Dec 06 20:59:06 2023 -0800
committer Andy Hung <hunga@google.com> Thu Dec 07 14:01:34 2023 -0800
tree f1ac12dc3c4a0681be0454a3f02a3cf009b068c8
parent e251446daa9e8c6f124d8bae8b3d97678b977ae4

AudioPolicyService: Fix mutex ordering issue

Test: Spatialization playback with order checking
Bug: 315240650
Change-Id: I8179352f0f503a67076bf4fd5328227861646bd5

services/audiopolicy/service/AudioPolicyService.cpp

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 7241597..5d3788d 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -299,7 +299,11 @@
         AudioDeviceTypeAddrVector devices;
         bool hasSpatializer = mAudioPolicyManager->canBeSpatialized(&attr, nullptr, devices);
         if (hasSpatializer) {
+            // Unlock as Spatializer::create() will use the callback and acquire the
+            // AudioPolicyService_Mutex.
+            mLock.unlock();
             mSpatializer = Spatializer::create(this, effectsFactoryHal);
+            mLock.lock();
         }
         if (mSpatializer == nullptr) {
             // No spatializer created, signal the reason: NO_INIT a failure, OK means intended.