commit 509f0a7cc76818f78ee95632164bbaa170f66abb
author yixuanjiang <yixuanjiang@google.com> Thu Sep 06 18:37:23 2018 +0800
committer Yixuan Jiang <yixuanjiang@google.com> Thu Sep 06 13:55:07 2018 +0000
tree 547529416ecbc3c2a89ba3197d28f090fb46f1af
parent 6c5e87cca33a93a59a5ed890a6fff6bb3a51e659

Revert "hal: add support to separate headset and headphones mixer backend"

This reverts commit 6c5e87cca33a93a59a5ed890a6fff6bb3a51e659.
Test: manual usb phone test
Bug: 114178494

Change-Id: I07c72aad45e7fc9f08876a71db58948721aa9519

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a93d52a..9559573 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -600,6 +600,7 @@
 int enable_audio_route(struct audio_device *adev,
                        struct audio_usecase *usecase)
 {
+    snd_device_t snd_device;
     char mixer_path[50];
 
     if (usecase == NULL)
@@ -607,21 +608,15 @@
 
     ALOGV("%s: enter: usecase(%d)", __func__, usecase->id);
 
+    if (usecase->type == PCM_CAPTURE)
+        snd_device = usecase->in_snd_device;
+    else
+        snd_device = usecase->out_snd_device;
     audio_extn_utils_send_app_type_cfg(adev, usecase);
     audio_extn_utils_send_audio_calibration(adev, usecase);
-    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);
     strcpy(mixer_path, use_case_table[usecase->id]);
-
-    if (usecase->type == VOICE_CALL) {
-        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);
-        if (!strstr(mixer_path, " "))
-            platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);
-    } else if (usecase->type == PCM_CAPTURE) {
-        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);
-    } else {
-        platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);
-    }
-
+    platform_add_backend_name(adev->platform, mixer_path, snd_device);
+    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);
     ALOGD("%s: usecase(%d) apply and update mixer path: %s", __func__,  usecase->id, mixer_path);
     audio_route_apply_and_update_path(adev->audio_route, mixer_path);
 
@@ -632,24 +627,19 @@
 int disable_audio_route(struct audio_device *adev,
                         struct audio_usecase *usecase)
 {
+    snd_device_t snd_device;
     char mixer_path[50];
 
     if (usecase == NULL)
         return -EINVAL;
 
     ALOGV("%s: enter: usecase(%d)", __func__, usecase->id);
+    if (usecase->type == PCM_CAPTURE)
+        snd_device = usecase->in_snd_device;
+    else
+        snd_device = usecase->out_snd_device;
     strcpy(mixer_path, use_case_table[usecase->id]);
-
-    if (usecase->type == VOICE_CALL) {
-        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);
-        if (!strstr(mixer_path, " "))
-            platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);
-    } else if (usecase->type == PCM_CAPTURE) {
-        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);
-    } else {
-        platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);
-    }
-
+    platform_add_backend_name(adev->platform, mixer_path, snd_device);
     ALOGD("%s: usecase(%d) reset and update mixer path: %s", __func__, usecase->id, mixer_path);
     audio_route_reset_and_update_path(adev->audio_route, mixer_path);
     audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_FREE);