commit dd93b40f6bef021f6b066fa0c880c934b58269dc
author Eric Laurent <elaurent@google.com> Tue Mar 08 21:42:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 08 21:42:27 2016 +0000
tree 0e86358a06fe08061b8cb0fd79b03123d9240fc7
parent 1bbf3e88374a8f221f8b9da1bebe7a70525196ff
parent d10f1be6b036522742f99ee4da97b6be6a970201

Merge "audio policy: change default in call routing for line out device" into nyc-dev am: 0c07db6e89
am: d10f1be6b0

* commit 'd10f1be6b036522742f99ee4da97b6be6a970201':
  audio policy: change default in call routing for line out device

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index 43664e6..1d2727e 100755
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -350,6 +350,8 @@
             if (device) break;
             device = availableOutputDevicesType & AUDIO_DEVICE_OUT_WIRED_HEADSET;
             if (device) break;
+            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_LINE;
+            if (device) break;
             device = availableOutputDevicesType & AUDIO_DEVICE_OUT_USB_DEVICE;
             if (device) break;
             if (!isInCall()) {
@@ -391,8 +393,6 @@
                 device = availableOutputDevicesType & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET;
                 if (device) break;
             }
-            device = availableOutputDevicesType & AUDIO_DEVICE_OUT_LINE;
-            if (device) break;
             device = availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER;
             if (device) break;
             device = mApmObserver->getDefaultOutputDevice()->type();