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 | 2a30be33a39b07bf4f945d9506ffda0fd076e6c2 (patch) | |
| tree | 39e315f0abd398d2e8d5d444fad30031468326a9 /services | |
| parent | 6386eb945fddbd82e421013f76bbd537b92d6669 (diff) | |
| parent | 5092d8c066a1a98343bbc16e33a6753e577b5e7f (diff) | |
| download | frameworks_av-2a30be33a39b07bf4f945d9506ffda0fd076e6c2.zip frameworks_av-2a30be33a39b07bf4f945d9506ffda0fd076e6c2.tar.gz frameworks_av-2a30be33a39b07bf4f945d9506ffda0fd076e6c2.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 |