commit 14693257081b73b1471d9fe3e1dffb6abaa9baf3
author Zach Jang <zachjang@google.com> Tue Oct 27 01:25:27 2015 +0000
committer The Android Automerger <android-build@google.com> Tue Oct 27 15:22:09 2015 -0700
tree 4370ae1116da2128a3ce55b052f9c3962b7c731e
parent 200072af0850f0b31f4aac8481ccf7d98acfd9ee

Revert "audio policy: bind setMode() and setPhoneState() operations"

This reverts commit 9ddf1c76121caef55a05c537d6a9a1d76c1d17be.

Change-Id: I860ecc288a1798605dff46f39107f4450ca5cd56

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index ca365a5..793c26a 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -76,14 +76,10 @@
 
     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;