commit 308c58967c04719c552276fe171c2114ecabcb85
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 27 16:32:15 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 27 16:32:15 2015 -0700
tree b0f4e4979b5bc1af71b121bc2c81e3c8e4f6bb9a
parent 415c22e480a4c0f80e04bdf25c383434b98092e2
parent d4adfa8f24baee121d298a9f2342a6efadbcc6d5

Merge "hal: Fix the device disable/enable sequence for capture usecases"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index d738de1..821b339 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -663,9 +663,10 @@
            specified usecase to new snd devices */
         list_for_each(node, &adev->usecase_list) {
             usecase = node_to_item(node, struct audio_usecase, list);
-            /* Update the out_snd_device only for the usecases that are enabled here */
-            if (switch_device[usecase->id] && (usecase->type != VOICE_CALL)) {
-                    usecase->out_snd_device = snd_device;
+            /* Update the out_snd_device only before enabling the audio route */
+            if (switch_device[usecase->id] ) {
+                usecase->out_snd_device = snd_device;
+                if (usecase->type != VOICE_CALL)
                     enable_audio_route(adev, usecase);
             }
         }

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index b3943fd..1133790 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2428,7 +2428,7 @@
         goto exit;
     }
 
-    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {
+    if (popcount(devices) == 2) {
         if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
                         AUDIO_DEVICE_OUT_SPEAKER)) {
             if (my_data->external_spk_1)

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index f2d975f..142a85d 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2049,7 +2049,7 @@
         goto exit;
     }
 
-    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {
+    if (popcount(devices) == 2) {
         if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
                         AUDIO_DEVICE_OUT_SPEAKER)) {
             if (my_data->external_spk_1)