diff options
| author | Eric Laurent <elaurent@google.com> | 2011-01-27 11:32:34 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-01-27 11:32:34 -0800 |
| commit | 111df679afd212115bff88481874715d98b04cdf (patch) | |
| tree | c7a7c8091f96985e2bb685a200cee073572b0d21 /services | |
| parent | ba3dd32357b47ab0b55a1976bbafc225df78a59d (diff) | |
| download | frameworks_base-111df679afd212115bff88481874715d98b04cdf.zip frameworks_base-111df679afd212115bff88481874715d98b04cdf.tar.gz frameworks_base-111df679afd212115bff88481874715d98b04cdf.tar.bz2 | |
Fix issue 2988031.
Limit SYSTEM stream volume when a headset is connected and music is playing.
Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
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 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 |