commit 8cad7241589b1473ee4dac3e4f2fdc559520da59
author Andy Hung <hunga@google.com> Mon Sep 11 22:32:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 11 22:32:15 2017 +0000
tree 3ac7cb747e008d1e4a2c60bfe9f293feb44eef59
parent e06a7d69ca960f65f7f22616238598277d91396d
parent c8f3cf02eb6c9f3246af40fd41872e3c79b3a689

Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2 am: 74f84d987b am: 355a18f58d
am: c8f3cf02eb

Change-Id: I7c984be87df715dbc6fe5ecc44691e001d7ff09f

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index a75e3dd..a41ed95 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -665,6 +665,7 @@
                                        audio_io_handle_t *ioHandle,
                                        audio_devices_t *device)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
@@ -674,6 +675,7 @@
 
 status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }