diff options
| author | Zach Jang <zachjang@google.com> | 2015-10-27 01:29:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-27 01:29:16 +0000 |
| commit | be6f10c049086453cc53b8e50c5d497bb5b3ae05 (patch) | |
| tree | ec6149ad6205af5d31b6260d103f3cc1ed034b53 /services | |
| parent | fd72a5b9e1b7d36d8afb116b8e08c28ad444c188 (diff) | |
| parent | 26ce11a1dd2a9b70865aec1b42c365dd19172511 (diff) | |
| download | frameworks_av-be6f10c049086453cc53b8e50c5d497bb5b3ae05.zip frameworks_av-be6f10c049086453cc53b8e50c5d497bb5b3ae05.tar.gz frameworks_av-be6f10c049086453cc53b8e50c5d497bb5b3ae05.tar.bz2 | |
Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp | 6 |
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; |