commit c97e4aa35ade8810aa66fdc0513d69cab56ae436
author android-build-team Robot <android-build-team-robot@google.com> Fri Jan 11 23:00:52 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jan 11 23:00:52 2019 +0000
tree a0857b5cdffefe7d971fce8d73055945119b1066
parent 825262686a71ac5ff446281aca135cf85bb87b04
parent a504d888d4cc53d8067bb67f9d7f1c063ca54a93

Snap for 5226300 from a504d888d4cc53d8067bb67f9d7f1c063ca54a93 to pi-b4s4-release

Change-Id: I736b8167f946890459ab517e13507a067df0b3f2

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 &&