Revert "audio policy: bind setMode() and setPhoneState() operations"android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-6.0.0_r7marshmallow-releasemarshmallow-cts-release

This reverts commit 9ddf1c76121caef55a05c537d6a9a1d76c1d17be.

Change-Id: I860ecc288a1798605dff46f39107f4450ca5cd56

1 files changed, 1 insertions, 5 deletions

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index ca365a5e12..793c26a1d6 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -76,14 +76,10 @@ status_t AudioPolicyService::setPhoneState(audio_mode_t state)
 
     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;