commit f6224dece52c569e27322580407c3f5898fa042b
author Zach Jang <zachjang@google.com> Tue Oct 27 02:33:12 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 27 02:33:12 2015 +0000
tree b7182ca18dcb96894fdad365403b17f12a3908c7
parent 8c5b71ce473517ea1270f6467fa518274bd54b35
parent 681bc45d2592ed447f70d1dd14e92ad584499c9d

Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""" into mnc-dev
am: 681bc45d25

* commit '681bc45d2592ed447f70d1dd14e92ad584499c9d':
  Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 793c26a..ca365a5 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -76,10 +76,14 @@
 
     ALOGV("setPhoneState()");
 
+    // acquire lock before calling setMode() so that setMode() + setPhoneState() are an atomic
+    // operation from policy manager standpoint (no other operation (e.g track start or stop)
+    // can be interleaved).
+    Mutex::Autolock _l(mLock);
+
     // TODO: check if it is more appropriate to do it in platform specific policy manager
     AudioSystem::setMode(state);
 
-    Mutex::Autolock _l(mLock);
     mAudioPolicyManager->setPhoneState(state);
     mPhoneState = state;
     return NO_ERROR;