diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-29 11:03:55 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-01-29 11:04:41 -0800 |
| commit | 80838d256d79400f126bc9110e50274c439607fd (patch) | |
| tree | 2e3bdb76e59a87f0d5d30759e789ca12408459e2 /services | |
| parent | a8d5dbbccdbd989e96669fdcbdb75374ed2799f4 (diff) | |
| parent | 0ef579939e6c96fcd2b42b164c5debf535a6a53b (diff) | |
| download | frameworks_base-80838d256d79400f126bc9110e50274c439607fd.zip frameworks_base-80838d256d79400f126bc9110e50274c439607fd.tar.gz frameworks_base-80838d256d79400f126bc9110e50274c439607fd.tar.bz2 | |
Merge 0ef57993 from gingerbread
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
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 |