commit 144f78906f1eefaf8cbde9298a1422fcea094447
author Jean-Baptiste Queru <jbq@google.com> Sat Jan 29 08:57:47 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 29 08:57:47 2011 -0800
tree 2e8a393fe19a343c8aa470ae33f5cc0f64dc44ad
parent 02235c39040120295314a402841b17f68752ec99
parent 2ef89309d41daac3d69fa78b31cd09cb2c262ca1

am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp

* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
  Fix issue 2988031.

services/audioflinger/AudioPolicyManagerBase.cpp

diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp
index 18abc0b..e84d136 100644
--- a/services/audioflinger/AudioPolicyManagerBase.cpp
+++ b/services/audioflinger/AudioPolicyManagerBase.cpp
@@ -1893,7 +1893,8 @@
         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