commit f71d2618532e73db5c01e3c00595d7d2ab2cff3e
author Eric Laurent <elaurent@google.com> Thu Oct 29 01:02:53 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 29 01:02:53 2015 +0000
tree 58b201943b7b0880fc47980866f6e0305f7c7d01
parent 6a1fcb2422d3dfb56d7227081bbb16a14383615c
parent 62ac714617c3c994619afdc0666ac3359d8084e7

Merge "AudioPolicyService: Synchronize access to AudioPolicyManager" am: 60cf8e8925
am: 62ac714617

* commit '62ac714617c3c994619afdc0666ac3359d8084e7':
  AudioPolicyService: Synchronize access to AudioPolicyManager

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index ca365a5..a228798 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -463,6 +463,7 @@
     if (mAudioPolicyManager == NULL) {
         return AUDIO_DEVICE_NONE;
     }
+    Mutex::Autolock _l(mLock);
     return mAudioPolicyManager->getDevicesForStream(stream);
 }