commit 9d13065a9a59758412c4175c0ad64647cb0ae254
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 09 21:39:22 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 09 21:39:22 2015 -0700
tree c4c581db716cb88157ed53af9d63c20ec176ad38
parent e2535306466ded0ab7b74fe74190f58d9b7d414e
parent 2664a5b1f500638d6321b26ff3f3a381e5fcb55c

Merge "hal: fix for FM recording in start_input_stream"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 1245ca4..6012d5b 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1062,7 +1062,9 @@
     struct audio_device *adev = in->dev;
     int snd_card_status = get_snd_card_state(adev);
 
-    in->usecase = platform_update_usecase_from_source(in->source,in->usecase);
+    int usecase = platform_update_usecase_from_source(in->source,in->usecase);
+    if (get_usecase_from_list(adev, usecase) == NULL)
+        in->usecase = usecase;
     ALOGD("%s: enter: stream(%p)usecase(%d: %s)",
           __func__, &in->stream, in->usecase, use_case_table[in->usecase]);
 
@@ -1078,8 +1080,13 @@
     if (ret)
         goto error_config;
     else
-        ALOGD("%s: Updated usecase(%d: %s)",
-              __func__, in->usecase, use_case_table[in->usecase]);
+        ALOGV("%s: usecase(%d)", __func__, in->usecase);
+
+    if (get_usecase_from_list(adev, in->usecase) != NULL) {
+        ALOGE("%s: use case assigned already in use, stream(%p)usecase(%d: %s)",
+            __func__, &in->stream, in->usecase, use_case_table[in->usecase]);
+        goto error_config;
+    }
 
     in->pcm_device_id = platform_get_pcm_device_id(in->usecase, PCM_CAPTURE);
     if (in->pcm_device_id < 0) {