diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-29 08:54:06 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-01-29 08:54:06 -0800 |
| commit | 2ef89309d41daac3d69fa78b31cd09cb2c262ca1 (patch) | |
| tree | 699025e929ec01e6188363e025a53e02d569ad10 /services | |
| parent | 60e91863e185f84ec36fa3293e57ac9aa8500749 (diff) | |
| parent | c812fd3e5a35f09b0d5d6e4cafb40d21b75053ac (diff) | |
| download | frameworks_av-2ef89309d41daac3d69fa78b31cd09cb2c262ca1.zip frameworks_av-2ef89309d41daac3d69fa78b31cd09cb2c262ca1.tar.gz frameworks_av-2ef89309d41daac3d69fa78b31cd09cb2c262ca1.tar.bz2 | |
Merge 13212f83 from gingerbread-plus-aosp
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyManagerBase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp index e4086c4..2c81c34 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -1835,7 +1835,8 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand AudioSystem::DEVICE_OUT_WIRED_HEADPHONE | AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET | AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) && - (getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) && + ((getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) || + (stream == AudioSystem::SYSTEM)) && streamDesc.mCanBeMuted) { volume *= SONIFICATION_HEADSET_VOLUME_FACTOR; // when the phone is ringing we must consider that music could have been paused just before |