commit ef52b30f9cc947ce2bbfcdab59e33bccb967d5df
author Andy Hung <hunga@google.com> Fri Jan 11 11:01:11 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 11 11:01:11 2019 -0800
tree 509da6104469c8c0e80c143581ec87ce6ea58427
parent 093bba3a2e7e696cdad4fd20844bfb1739db7280
parent a41770b682117fdfc20236fbc45d975099f9147a

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

Change-Id: I496c058113e7f5b36d049cca1a978e191b987142

services/audioflinger/AudioFlinger.cpp

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