commit 0921ee762aa1df9faaacd44e81b963644bd0c3a9
author Vignesh Kulothungan <vigneshk@codeaurora.org> Thu Jun 07 14:51:09 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 20 15:46:48 2018 -0700
tree c4716cce962fa84f6dad2336a0cd8fe99d7447e7
parent 0d1a559269aba4a69576f6703ffa66db593317c4

hal: Remove audio route apply for speaker swap

Remove audio route apply for speaker swap from platform.
Speaker swap is done using driver via mixer controls.

CRs-Fixed: 2258379
Change-Id: I3c96ab89c1dc6f83913c1689eb0df091b7aa71be

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index d65c389..f9b1d5e 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -7908,7 +7908,6 @@
 {
     const char *mixer_ctl_name = "Swap channel";
     struct mixer_ctl *ctl;
-    const char *mixer_path;
     struct platform_data *my_data = (struct platform_data *)adev->platform;
 
     // forced to set to swap, but device not rotated ... ignore set
@@ -7917,13 +7916,6 @@
 
     ALOGV("%s:", __func__);
 
-    if (swap_channels)
-        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER_REVERSE);
-    else
-        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER);
-
-    audio_route_apply_and_update_path(adev->audio_route, mixer_path);
-
     ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
     if (!ctl) {
         ALOGE("%s: Could not get ctl for mixer cmd - %s",__func__, mixer_ctl_name);

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index a5f36ba..ac531c1 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -7765,7 +7765,6 @@
 {
     const char *mixer_ctl_name = "Swap channel";
     struct mixer_ctl *ctl;
-    const char *mixer_path;
     struct platform_data *my_data = (struct platform_data *)adev->platform;
 
     // forced to set to swap, but device not rotated ... ignore set
@@ -7774,13 +7773,6 @@
 
     ALOGV("%s:", __func__);
 
-    if (swap_channels)
-        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER_REVERSE);
-    else
-        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER);
-
-    audio_route_apply_and_update_path(adev->audio_route, mixer_path);
-
     ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
     if (!ctl) {
         ALOGE("%s: Could not get ctl for mixer cmd - %s",__func__, mixer_ctl_name);