commit 4b7fdaaf6b7084032cf6f58bf23fc97027d9fdd7
author Krishnankutty Kolathappilly <kkolat@codeaurora.org> Mon Dec 16 00:40:11 2013 -0800
committer Krishnankutty Kolathappilly <kkolat@codeaurora.org> Wed Dec 18 17:20:31 2013 -0800
tree 12a3d7ec4faef2d6e01a9f272c98c2b39facc745
parent eb78be7e656d1048aab20e882dc7b6ceb29486af

policy_hal: Do not allow sonification for USB headset.

- Ringtone will be played on speaker when USB headset is connected.
- Sonification is not allowed for USB headset. The behavior is
  similar to HDMI.

CRs-Fixed: 588622
Change-Id: I5fba6ae0e42235f4144ccebac2a55fe1529b530a

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 0716656..c1efeb6 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -640,7 +640,8 @@
             device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_AUX_DIGITAL;
         }
         if ((device2 == AUDIO_DEVICE_NONE) &&
-                (mForceUse[AudioSystem::FOR_DOCK] == AudioSystem::FORCE_ANALOG_DOCK)) {
+                (mForceUse[AudioSystem::FOR_DOCK] == AudioSystem::FORCE_ANALOG_DOCK)
+                && (strategy != STRATEGY_SONIFICATION)) {
             device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET;
         }
 #ifdef AUDIO_EXTN_FM_ENABLED