commit 7b54d4eebaa0b4bf2c814594e02941339f8abfd4
author Linux Build Service Account <lnxbuild@localhost> Sat Dec 07 00:25:51 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Dec 07 00:25:51 2013 -0800
tree 862abe509e5366f439f186e113ea7c4caa310dde
parent 20d8342e9997f6c80db7e9462c691a32decfecde
parent 116f1eccefd1feb1449ff73a0457dea53387c770

Merge "Merge commit 'android-4.4.1_r1' into HEAD"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 54b4166..bca6a26 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -390,6 +390,13 @@
                 enable_snd_device(adev, snd_device, false);
             }
         }
+
+        list_for_each(node, &adev->usecase_list) {
+            usecase = node_to_item(node, struct audio_usecase, list);
+            if (switch_device[usecase->id]) {
+                enable_snd_device(adev, snd_device, false);
+            }
+        }
         /* Make sure new snd device is enabled before re-routing the streams */
         audio_route_update_mixer(adev->audio_route);
 
@@ -1261,8 +1268,8 @@
     }
 
     pthread_mutex_lock(&out->lock);
-    pthread_mutex_lock(&adev->lock);
     if (!out->standby) {
+        pthread_mutex_lock(&adev->lock);
         out->standby = true;
         if (out->usecase != USECASE_AUDIO_PLAYBACK_OFFLOAD) {
             if (out->pcm) {
@@ -1279,8 +1286,8 @@
             }
         }
         stop_output_stream(out);
+        pthread_mutex_unlock(&adev->lock);
     }
-    pthread_mutex_unlock(&adev->lock);
     pthread_mutex_unlock(&out->lock);
     ALOGV("%s: exit", __func__);
     return 0;
@@ -1786,12 +1793,12 @@
 
     pthread_mutex_lock(&in->lock);
     if (!in->standby) {
+        pthread_mutex_lock(&adev->lock);
         in->standby = true;
         if (in->pcm) {
             pcm_close(in->pcm);
             in->pcm = NULL;
         }
-        pthread_mutex_lock(&adev->lock);
         status = stop_input_stream(in);
         pthread_mutex_unlock(&adev->lock);
     }