commit 1147f08d976cda171ce3552c3114528accdc8ac9
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 21 09:38:20 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 21 09:38:20 2015 -0800
tree 21cd6e6a7111042bd4fda9d3f7d7b475e0bbca5d
parent d1d62da9aa18c48d9ddaf839f87de29306ec974a
parent 9e95c2424ab48350d6494236ded2bcc9ae080e2c

Merge "hal: Fix for FM mute issue on start of FM record"

hal/audio_extn/fm.c

diff --git a/hal/audio_extn/fm.c b/hal/audio_extn/fm.c
index b6f8689..ed3776c 100644
--- a/hal/audio_extn/fm.c
+++ b/hal/audio_extn/fm.c
@@ -34,6 +34,7 @@
 #ifdef FM_ENABLED
 #define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"
 #define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"
+#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"
 
 static struct pcm_config pcm_config_fm = {
     .channels = 2,
@@ -280,6 +281,21 @@
         fm_set_volume(adev, vol);
     }
 
+#ifdef RECORD_PLAY_CONCURRENCY
+    ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_REC_PLAY_CONC,
+                               value, sizeof(value));
+    if ((ret >= 0)
+          && (fmmod.is_fm_running == true)) {
+
+        if (!strncmp("true", value, sizeof("true")))
+            ALOGD("Record play concurrency ON Forcing FM device reroute");
+        else
+            ALOGD("Record play concurrency OFF Forcing FM device reroute");
+
+        select_devices(adev, USECASE_AUDIO_PLAYBACK_FM);
+        fm_set_volume(adev,fmmod.fm_volume);
+    }
+#endif
 exit:
     ALOGV("%s: exit", __func__);
 }

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index b72f017..4b71451 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2238,7 +2238,6 @@
             ALOGD("setting record playback concurrency to false");
             my_data->rec_play_conc_set = false;
         }
-        str_parms_del(parms, AUDIO_PARAMETER_KEY_REC_PLAY_CONC);
     }
 #endif
     ALOGV("%s: exit with code(%d)", __func__, ret);