Merge 0ef57993 from gingerbread

Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf

diff --cc services/audioflinger/AudioPolicyManagerBase.cpp
index e4086c4,4612af1..2c81c34
--- 1/services/audioflinger/AudioPolicyManagerBase.cpp
--- 2/services/audioflinger/AudioPolicyManagerBase.cpp
+++ b/services/audioflinger/AudioPolicyManagerBase.cpp
@@@ -1832,10 -1805,9 +1832,11 @@@ float AudioPolicyManagerBase::computeVo
          (AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP |
          AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |
          AudioSystem::DEVICE_OUT_WIRED_HEADSET |
 -        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) &&
 +        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