commit 27c4e661d45ea44d1e2feb6d02bb5f0ed842916e
author Andy Hung <hunga@google.com> Tue Sep 12 01:30:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 12 01:30:39 2017 +0000
tree fdb6a869fe0537cc0ca285712a52bbb57120526a
parent 94c1663ec9c543fb4f408bd0780c5b207a704529
parent 35a587cdc548394a7fcb569815f9f4a65e5ff8a1

Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev
am: 35a587cdc5

Change-Id: I673c315dadc97b06ceb75d552c22e3ce5e0629bc

services/audiopolicy/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
index 091ef07..0735b28 100644
--- a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
@@ -631,6 +631,7 @@
                                        audio_io_handle_t *ioHandle,
                                        audio_devices_t *device)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
@@ -640,6 +641,7 @@
 
 status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }