commit c812fd3e5a35f09b0d5d6e4cafb40d21b75053ac
author Eric Laurent <elaurent@google.com> Thu Jan 27 18:40:42 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 27 18:40:42 2011 -0800
tree 96e4df21896c0eb7d6bbd74fc4741fb2867c1331
parent 05b8794654688079247c5d1d5b59dd0d288fd436
parent 5092d8c066a1a98343bbc16e33a6753e577b5e7f

am 0ef57993: Merge "Fix issue 2988031." into gingerbread

* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
  Fix issue 2988031.

services/audioflinger/AudioPolicyManagerBase.cpp

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 @@
         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