commit a504d888d4cc53d8067bb67f9d7f1c063ca54a93
author Andy Hung <hunga@google.com> Fri Jan 11 11:19:34 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 11 11:19:34 2019 -0800
tree a0857b5cdffefe7d971fce8d73055945119b1066
parent 06c5d535332898944d627b6e114d1f39ae3e6c86
parent b6a54df739810e5f963b7357c7e79ff72188a4b2

AudioFlinger: put effect desc lookup under mutex for createEffect am: a41770b682 am: ef52b30f9c
am: b6a54df739

Change-Id: I26faa1f350066134fcb13cbc7b03b33ff3b9374f

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index bdd39c6..687b5a6 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3001,6 +3001,8 @@
     }
 
     {
+        Mutex::Autolock _l(mLock);
+
         if (!EffectsFactoryHalInterface::isNullUuid(&pDesc->uuid)) {
             // if uuid is specified, request effect descriptor
             lStatus = mEffectsFactoryHal->getDescriptor(&pDesc->uuid, &desc);
@@ -3056,6 +3058,8 @@
                 desc = d;
             }
         }
+    }
+    {
 
         // Do not allow auxiliary effects on a session different from 0 (output mix)
         if (sessionId != AUDIO_SESSION_OUTPUT_MIX &&