commit 955dee58ee103926a04d26a24cd7d9d73dba0641
author Jean-Michel Trivi <jmtrivi@google.com> Wed Sep 21 02:17:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 02:17:29 2016 +0000
tree 5eca4b44e831e4e00882b05c989f01873b22f9ee
parent f5d48f09d4fee954305f055f0d07cc5ff9223078
parent 09fef3caf540bc7b85d9ed46cef81ee19cb4543e

Merge "Speaker channel swapping is conditional to audio mode" into nyc-mr1-dev
am: 09fef3caf5

Change-Id: I6bcae92653fecb662ceb8a78ba6a62167b640e6e

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 52e9fd8..a5a2c9b 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1367,12 +1367,10 @@
     struct mixer_ctl *ctl;
     const char *mixer_ctl_name = "Voice Tx Mute";
     int ret = 0;
-    uint32_t set_values[ ] = {0,
-                              ALL_SESSION_VSID,
-                              DEFAULT_MUTE_RAMP_DURATION_MS};
+    uint32_t set_values[ ] = {0};
 
     if (audio_extn_hfp_is_active(adev))
-        mixer_ctl_name = "HFP Tx Mute";
+        mixer_ctl_name = "HFP TX Mute";
 
     set_values[0] = state;
     ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);

post_proc/Android.mk

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 59ee105..83f6a49 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909,$(TARGET_BOARD_PLATFORM)),)
 
 LOCAL_PATH:= $(call my-dir)
 
@@ -33,7 +33,7 @@
 
 ################################################################################
 
-ifneq ($(filter msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8992 msm8994 msm8996 msm8909,$(TARGET_BOARD_PLATFORM)),)
 
 include $(CLEAR_VARS)