diff options
| author | Andy Hung <hunga@google.com> | 2017-09-12 01:30:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 01:30:39 +0000 |
| commit | 27c4e661d45ea44d1e2feb6d02bb5f0ed842916e (patch) | |
| tree | fdb6a869fe0537cc0ca285712a52bbb57120526a | |
| parent | 94c1663ec9c543fb4f408bd0780c5b207a704529 (diff) | |
| parent | 35a587cdc548394a7fcb569815f9f4a65e5ff8a1 (diff) | |
| download | frameworks_av-27c4e661d45ea44d1e2feb6d02bb5f0ed842916e.tar.gz frameworks_av-27c4e661d45ea44d1e2feb6d02bb5f0ed842916e.tar.bz2 frameworks_av-27c4e661d45ea44d1e2feb6d02bb5f0ed842916e.zip | |
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev
am: 35a587cdc5
Change-Id: I673c315dadc97b06ceb75d552c22e3ce5e0629bc
| -rw-r--r-- | services/audiopolicy/AudioPolicyInterfaceImpl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp index 091ef070de..0735b28a00 100644 --- a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp +++ b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp @@ -631,6 +631,7 @@ status_t AudioPolicyService::acquireSoundTriggerSession(audio_session_t *session 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::acquireSoundTriggerSession(audio_session_t *session status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session) { + Mutex::Autolock _l(mLock); if (mAudioPolicyManager == NULL) { return NO_INIT; } |