Revert "audio policy: bind setMode() and setPhoneState() operations"
This reverts commit 9ddf1c76121caef55a05c537d6a9a1d76c1d17be.
Change-Id: I860ecc288a1798605dff46f39107f4450ca5cd56
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;