Snap for 4402310 from b1bb73617ccd6a12c90b557b9847cdb4935136b1 to oc-m2-release
Change-Id: I0cf140adb2b61fb1de773fd3e2584bea04003fff
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 685169f..7267931 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -687,9 +687,12 @@
audio_extn_spkr_prot_is_enabled()) {
audio_extn_spkr_prot_stop_processing(snd_device);
+ // FIXME b/65363602: bullhead is the only Nexus with audio_extn_spkr_prot_is_enabled()
+ // and does not use speaker swap. As this code causes a problem with device enable ref
+ // counting we remove it for now.
// when speaker device is disabled, reset swap.
// will be renabled on usecase start
- platform_set_swap_channels(adev, false);
+ // platform_set_swap_channels(adev, false);
} else if (platform_can_split_snd_device(snd_device,
&num_devices,
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3b1d4d5..6560d14 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1086,6 +1086,11 @@
hw_interface_table[SND_DEVICE_IN_VOICE_REC_MIC_NS] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_VOICE_REC_DMIC_STEREO] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE] = strdup("SLIMBUS_0_TX");
+ hw_interface_table[SND_DEVICE_IN_UNPROCESSED_MIC] = strdup("SLIMBUS_0_TX");
+ hw_interface_table[SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC] = strdup("SLIMBUS_0_TX");
+ hw_interface_table[SND_DEVICE_IN_UNPROCESSED_STEREO_MIC] = strdup("SLIMBUS_0_TX");
+ hw_interface_table[SND_DEVICE_IN_UNPROCESSED_THREE_MIC] = strdup("SLIMBUS_0_TX");
+ hw_interface_table[SND_DEVICE_IN_UNPROCESSED_QUAD_MIC] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_SPEAKER_MIC] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_SPEAKER_MIC_AEC] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_SPEAKER_MIC_NS] = strdup("SLIMBUS_0_TX");
