commit 9715bf6908ee5497231dc9469eb3984e543a6880
author Chris Soyars <ctso@ctso.me> Wed Mar 05 11:26:07 2014 -0800
committer Chris Soyars <ctso@ctso.me> Wed Mar 05 11:26:36 2014 -0800
tree e2bab5134549b349d68355ebe1772088e3e52858
parent 7a133590ff567fe09b7f415371c78480d39a83e7

Revert "audio: Fix check for sonification on digital docks"

This reverts commit 7a133590ff567fe09b7f415371c78480d39a83e7.

Change-Id: I27968a26e755e85d4d0c150278bf7988cc86f4e6

audio/AudioPolicyManagerBase.cpp

diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 944b783..fdf0ca8 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -2528,9 +2528,7 @@
         if (device2 == AUDIO_DEVICE_NONE) {
             device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_USB_DEVICE;
         }
-        if ((device2 == AUDIO_DEVICE_NONE) &&
-                (mForceUse[AudioSystem::FOR_DOCK] == AudioSystem::FORCE_DIGITAL_DOCK)
-                && (strategy != STRATEGY_SONIFICATION)) {
+        if ((device2 == AUDIO_DEVICE_NONE) && (strategy != STRATEGY_SONIFICATION)) {
             // no sonification on digital docks (e.g. USB DACs)
             device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET;
         }