commit 122ec92c425ce898753d24edd4a43d634a630959
author Andy Hung <hunga@google.com> Mon Sep 11 22:33:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 11 22:33:46 2017 +0000
tree 34f6484abb85cfc9b4eed000c1812f1f63be5fdb
parent 099005643902d7a26bbefa5d316ea85cdd2d53bc
parent 8cad7241589b1473ee4dac3e4f2fdc559520da59

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
am: 8cad724158

Change-Id: I1d0102e75a068bd6a2af21b9126b907703928db7

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 1e63a05..2f7b1fb 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -693,6 +693,7 @@
                                        audio_io_handle_t *ioHandle,
                                        audio_devices_t *device)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
@@ -702,6 +703,7 @@
 
 status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }