summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorZach Jang <zachjang@google.com>2015-10-27 01:25:27 +0000
committerZach Jang <zachjang@google.com>2015-10-27 01:25:27 +0000
commit26ce11a1dd2a9b70865aec1b42c365dd19172511 (patch)
treeda2c975edfeada4f3d1e2d7ca37cad9ada599f4b /services
parent9ddf1c76121caef55a05c537d6a9a1d76c1d17be (diff)
downloadframeworks_av-26ce11a1dd2a9b70865aec1b42c365dd19172511.zip
frameworks_av-26ce11a1dd2a9b70865aec1b42c365dd19172511.tar.gz
frameworks_av-26ce11a1dd2a9b70865aec1b42c365dd19172511.tar.bz2
Revert "audio policy: bind setMode() and setPhoneState() operations"
This reverts commit 9ddf1c76121caef55a05c537d6a9a1d76c1d17be. Change-Id: I860ecc288a1798605dff46f39107f4450ca5cd56
Diffstat (limited to 'services')
-rw-r--r--services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp6
1 files changed, 1 insertions, 5 deletions
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 @@ 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;