commit 0123ede86c9ab44671ebd921cc51d4e1982b18fc
author Andy Hung <hunga@google.com> Mon Oct 22 17:07:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 22 17:07:05 2018 +0000
tree 3ac372b2498b96db1d793c5367925fc59236e0b2
parent 840a29db3b6dcbb9b1fab20013d8d91e7aa3d901
parent 11f10e295e6cdce6ac94da428d747673bdca6a59

Merge "audio_hw: make mixer_path obey limits of MIXER_PATH_MAX_LENGTH"

hal/audio_extn/a2dp.c

diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index c3a8d5d..7c2e4db 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -753,8 +753,6 @@
         if (a2dp.audio_stream_close() == false)
             ALOGE("%s: failed close A2DP control path from Bluetooth IPC library", __func__);
     }
-    if (a2dp.abr_config.is_abr_enabled && a2dp.abr_config.abr_started)
-        stop_abr();
     a2dp_common_init();
     a2dp.enc_sampling_rate = 0;
     a2dp.enc_channels = 0;
@@ -1564,8 +1562,7 @@
          val = atoi(value);
          if (audio_is_a2dp_out_device(val)) {
              ALOGV("%s: Received device disconnect request", __func__);
-             reset_a2dp_enc_config_params();
-             reset_a2dp_dec_config_params();
+             reset_a2dp_config();
              close_a2dp_output();
          }
          goto param_handled;

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 875e880..221942a 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1437,10 +1437,17 @@
     pdata->current_backend_cfg[USB_AUDIO_TX_BACKEND].channels_mixer_ctl =
             strdup("USB_AUDIO_TX Channels");
 
-    pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
-            strdup("SLIM_6_RX Format");
-    pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
-            strdup("SLIM_6_RX SampleRate");
+    if (strstr(pdata->snd_card_name, "intcodec")) {
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
+                strdup("INT0_MI2S_RX Format");
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
+                strdup("INT0_MI2S_RX SampleRate");
+    } else {
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
+                strdup("SLIM_6_RX Format");
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
+                strdup("SLIM_6_RX SampleRate");
+    }
 
     pdata->current_backend_cfg[USB_AUDIO_RX_BACKEND].bitwidth_mixer_ctl =
             strdup("USB_AUDIO_RX Format");