diff options
| author | Eric Laurent <elaurent@google.com> | 2011-01-27 18:37:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 18:37:04 -0800 |
| commit | 0ef579939e6c96fcd2b42b164c5debf535a6a53b (patch) | |
| tree | dd52f7ba292af9cdffaa58bf3b4bf182264806b6 | |
| parent | 226e57563c3110aa688fc41f10b7a96cd21b6231 (diff) | |
| parent | 111df679afd212115bff88481874715d98b04cdf (diff) | |
| download | frameworks_base-0ef579939e6c96fcd2b42b164c5debf535a6a53b.zip frameworks_base-0ef579939e6c96fcd2b42b164c5debf535a6a53b.tar.gz frameworks_base-0ef579939e6c96fcd2b42b164c5debf535a6a53b.tar.bz2 | |
Merge "Fix issue 2988031." into gingerbread
| -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 0da353a..4612af1 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -1806,7 +1806,8 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES | AudioSystem::DEVICE_OUT_WIRED_HEADSET | AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) && - (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 |