diff options
| author | Zach Jang <zachjang@google.com> | 2015-10-27 01:33:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-27 01:33:47 +0000 |
| commit | fd16414d341b1c104068c489103aeb2ddb8995e6 (patch) | |
| tree | 1aa3f492b81e9b7834babf095188ce9eb4439621 /services | |
| parent | 28323c3d9a6dff48c480c50a358d9bd4fdeed407 (diff) | |
| parent | be6f10c049086453cc53b8e50c5d497bb5b3ae05 (diff) | |
| download | frameworks_av-fd16414d341b1c104068c489103aeb2ddb8995e6.zip frameworks_av-fd16414d341b1c104068c489103aeb2ddb8995e6.tar.gz frameworks_av-fd16414d341b1c104068c489103aeb2ddb8995e6.tar.bz2 | |
Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev
am: be6f10c049
* commit 'be6f10c049086453cc53b8e50c5d497bb5b3ae05':
Revert "audio policy: bind setMode() and setPhoneState() operations"
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; |