Merge "configs: Adds detection event type id for SVA"
diff --git a/configs/lahaina/audio_platform_info_shimaidp.xml b/configs/lahaina/audio_platform_info_shimaidp.xml
index ad23368..68287fc 100644
--- a/configs/lahaina/audio_platform_info_shimaidp.xml
+++ b/configs/lahaina/audio_platform_info_shimaidp.xml
@@ -130,7 +130,7 @@
<!-- followed by perf lock options -->
<param key="perf_lock_opts" value="4, 0x40400000, 0x1, 0x40C00000, 0x1"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
- <param key="input_mic_max_count" value="3"/>
+ <param key="input_mic_max_count" value="4"/>
<param key="true_32_bit" value="true"/>
<param key="hifi_filter" value="false"/>
<!-- In the below value string, the value indicates sidetone gain in dB -->
diff --git a/configs/lahaina/lahaina.mk b/configs/lahaina/lahaina.mk
index 007ce20..29adcb1 100644
--- a/configs/lahaina/lahaina.mk
+++ b/configs/lahaina/lahaina.mk
@@ -103,6 +103,7 @@
PRODUCT_PACKAGES += $(AUDIO_WRAPPER)
PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)
PRODUCT_PACKAGES += ftm_test_config_lahaina-qrd-snd-card
+PRODUCT_PACKAGES += ftm_test_config_lahaina-hdk-snd-card
PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidp-snd-card
PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidps-snd-card
PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaqrd-snd-card
@@ -251,6 +252,11 @@
persist.vendor.audio.spv4.enable=true\
persist.vendor.audio.avs.afe_api_version=9
+##bcl aka vbat monitor feature enable by default
+PRODUCT_PROPERTY_OVERRIDES += \
+persist.vendor.audio.vbat.enabled=true\
+persist.vendor.audio.bcl.enabled=true\
+
#disable tunnel encoding
PRODUCT_PROPERTY_OVERRIDES += \
vendor.audio.tunnel.encode=false
diff --git a/configs/lahaina/mixer_paths.xml b/configs/lahaina/mixer_paths.xml
index 237b256..a66bdc4 100644
--- a/configs/lahaina/mixer_paths.xml
+++ b/configs/lahaina/mixer_paths.xml
@@ -2422,12 +2422,12 @@
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
@@ -2447,12 +2447,12 @@
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones">
@@ -2466,37 +2466,37 @@
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
@@ -2506,12 +2506,12 @@
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
diff --git a/configs/lahaina/mixer_paths_cdp.xml b/configs/lahaina/mixer_paths_cdp.xml
index faeb34d..b31d517 100644
--- a/configs/lahaina/mixer_paths_cdp.xml
+++ b/configs/lahaina/mixer_paths_cdp.xml
@@ -2261,12 +2261,12 @@
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
@@ -2286,12 +2286,12 @@
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones">
@@ -2305,37 +2305,37 @@
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
@@ -2345,12 +2345,12 @@
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
diff --git a/configs/lahaina/mixer_paths_qrd.xml b/configs/lahaina/mixer_paths_qrd.xml
index 88d2ae0..bf05eae 100644
--- a/configs/lahaina/mixer_paths_qrd.xml
+++ b/configs/lahaina/mixer_paths_qrd.xml
@@ -2414,12 +2414,12 @@
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
@@ -2439,12 +2439,12 @@
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones">
@@ -2458,37 +2458,37 @@
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
@@ -2498,12 +2498,12 @@
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
@@ -3071,7 +3071,7 @@
<path name="speaker-dmic-broadside">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC5" />
+ <ctl name="TX DMIC MUX1" value="DMIC4" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC1" />
</path>
diff --git a/configs/lahaina/mixer_paths_shimaidp.xml b/configs/lahaina/mixer_paths_shimaidp.xml
index 4e9dae6..35fc799 100644
--- a/configs/lahaina/mixer_paths_shimaidp.xml
+++ b/configs/lahaina/mixer_paths_shimaidp.xml
@@ -2361,12 +2361,12 @@
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
@@ -2386,12 +2386,12 @@
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones">
@@ -2405,37 +2405,37 @@
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
@@ -2445,12 +2445,12 @@
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
@@ -2912,7 +2912,7 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC1" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC5" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC9" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="ADC2_MIXER Switch" value="1" />
@@ -2921,7 +2921,7 @@
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
</path>
<path name="dmic-endfire">
@@ -2994,14 +2994,14 @@
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
<ctl name="TX SMIC MUX1" value="SWR_MIC0" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC5" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC9" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
<ctl name="ADC4_MIXER Switch" value="1" />
<ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
</path>
<path name="dmic-broadside">
@@ -3016,24 +3016,25 @@
<!-- Tri MIC devices -->
<path name="three-mic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
- <ctl name="TX DEC1 MUX" value="SWR_MIC" />
- <ctl name="TX DEC2 MUX" value="SWR_MIC" />
- <ctl name="TX DEC3 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC0" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC5" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
- <ctl name="ADC1_MIXER Switch" value="1" />
- <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC4_MIXER Switch" value="1" />
+ <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+ <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+ <ctl name="TX DEC3 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC9" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC0" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC8" />
<ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
- <ctl name="ADC2_MIXER Switch" value="1" />
- <ctl name="ADC2 MUX" value="INP3" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
+ <ctl name="ADC3 MUX" value="INP4" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
+ <ctl name="HDR34 MUX" value="NO_HDR34" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4_MIXER Switch" value="1" />
</path>
<path name="speaker-tmic">
@@ -3047,31 +3048,31 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Four" />
- <ctl name="TX DEC1 MUX" value="SWR_MIC" />
- <ctl name="TX DEC2 MUX" value="SWR_MIC" />
- <ctl name="TX DEC3 MUX" value="SWR_MIC" />
- <ctl name="TX DEC4 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC0" />
- <ctl name="TX SMIC MUX2" value="SWR_MIC5" />
- <ctl name="TX SMIC MUX3" value="SWR_MIC1" />
- <ctl name="TX SMIC MUX4" value="SWR_MIC4" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />
- <ctl name="ADC1_MIXER Switch" value="1" />
- <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC4_MIXER Switch" value="1" />
- <ctl name="ADC4 MUX" value="INP5" />
- <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />
- <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+ <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+ <ctl name="TX DEC3 MUX" value="SWR_MIC" />
+ <ctl name="TX DEC4 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX1" value="SWR_MIC9" />
+ <ctl name="TX SMIC MUX2" value="SWR_MIC0" />
+ <ctl name="TX SMIC MUX3" value="SWR_MIC8" />
+ <ctl name="TX SMIC MUX4" value="SWR_MIC1" />
<ctl name="ADC2 MUX" value="INP3" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
- <ctl name="HDR12 MUX" value="NO_HDR12" />
- <ctl name="ADC3_MIXER Switch" value="1" />
<ctl name="ADC3 MUX" value="INP4" />
- <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />
+ <ctl name="ADC4 MUX" value="INP5" />
+ <ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
+ <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
+ <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4_MIXER Switch" value="1" />
</path>
<path name="speaker-qmic-liquid">
diff --git a/configs/lahaina/mixer_paths_shimaidps.xml b/configs/lahaina/mixer_paths_shimaidps.xml
index e395959..3e16615 100644
--- a/configs/lahaina/mixer_paths_shimaidps.xml
+++ b/configs/lahaina/mixer_paths_shimaidps.xml
@@ -2221,12 +2221,12 @@
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
@@ -2246,12 +2246,12 @@
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones">
@@ -2265,37 +2265,37 @@
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
@@ -2305,12 +2305,12 @@
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
diff --git a/configs/lahaina/mixer_paths_shimaqrd.xml b/configs/lahaina/mixer_paths_shimaqrd.xml
index a5edd21..a736029 100644
--- a/configs/lahaina/mixer_paths_shimaqrd.xml
+++ b/configs/lahaina/mixer_paths_shimaqrd.xml
@@ -2453,12 +2453,12 @@
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
@@ -2478,12 +2478,12 @@
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones">
@@ -2497,37 +2497,37 @@
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
@@ -2537,12 +2537,12 @@
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
- <path name="audio-with-haptics-playback" />
+ <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
diff --git a/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml b/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml
index 04781a8..d809f12 100644
--- a/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml
+++ b/configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml
@@ -96,6 +96,10 @@
<ctl name="TX1 MODE" value="ADC_LP" />
<ctl name="TX2 MODE" value="ADC_LP" />
<ctl name="TX3 MODE" value="ADC_LP" />
+ <ctl name="ADC1 ChMap" value="ZERO" />
+ <ctl name="ADC2 ChMap" value="ZERO" />
+ <ctl name="ADC3 ChMap" value="ZERO" />
+ <ctl name="ADC4 ChMap" value="ZERO" />
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -276,21 +280,24 @@
<ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="SWR_MIC0" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="VA DEC1 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX1" value="SWR_MIC1" />
- <ctl name="ADC2_MIXER Switch" value="1" />
- <ctl name="ADC2 MUX" value="INP3" />
<ctl name="VA DEC2 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX2" value="SWR_MIC2" />
- <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC9" />
+ <ctl name="VA SMIC MUX1" value="SWR_MIC0" />
+ <ctl name="VA SMIC MUX2" value="SWR_MIC8" />
+ <ctl name="ADC4 MUX" value="INP5" />
<ctl name="ADC3 MUX" value="INP4" />
<ctl name="HDR12 MUX" value="NO_HDR12" />
<ctl name="HDR34 MUX" value="NO_HDR34" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
- <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
- <ctl name="ADC3 ChMap" value="SWRM_TX1_CH3" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4_MIXER Switch" value="1" />
</path>
<path name="listen-ape-handset-qmic">
@@ -300,24 +307,28 @@
<ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="VA_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="SWR_MIC0" />
- <ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="VA DEC1 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX1" value="SWR_MIC1" />
- <ctl name="ADC2_MIXER Switch" value="1" />
- <ctl name="ADC2 MUX" value="INP3" />
- <ctl name="VA DEC3 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX3" value="SWR_MIC3" />
- <ctl name="ADC3_MIXER Switch" value="1" />
- <ctl name="ADC3 MUX" value="INP4" />
<ctl name="VA DEC2 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX2" value="SWR_MIC2" />
- <ctl name="ADC4_MIXER Switch" value="1" />
+ <ctl name="VA DEC3 MUX" value="SWR_MIC" />
+ <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA_DEC3 MODE" value="ADC_LOW_PWR" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC9" />
+ <ctl name="VA SMIC MUX1" value="SWR_MIC0" />
+ <ctl name="VA SMIC MUX2" value="SWR_MIC8" />
+ <ctl name="VA SMIC MUX3" value="SWR_MIC1" />
+ <ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="ADC3 MUX" value="INP4" />
<ctl name="ADC4 MUX" value="INP5" />
<ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />
<ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
- <ctl name="ADC3 ChMap" value="SWRM_TX1_CH3" />
- <ctl name="ADC4 ChMap" value="SWRM_TX1_CH4" />
+ <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />
+ <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC4_MIXER Switch" value="1" />
</path>
<path name="listen-ape-headset-mic">
diff --git a/configs/msm8937/audio_policy_configuration.xml b/configs/msm8937/audio_policy_configuration.xml
index 0b2a31a..b9f9049 100644
--- a/configs/msm8937/audio_policy_configuration.xml
+++ b/configs/msm8937/audio_policy_configuration.xml
@@ -137,7 +137,7 @@
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
</mixPort>
- <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">
+ <mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
@@ -268,7 +268,7 @@
<route type="mix" sink="Telephony Tx"
sources="voice_tx"/>
<route type="mix" sink="primary input"
- sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner"/>
<route type="mix" sink="surround_sound"
sources="Built-In Mic,Built-In Back Mic"/>
<route type="mix" sink="voice_rx"
diff --git a/configs/msm8953/audio_policy_configuration.xml b/configs/msm8953/audio_policy_configuration.xml
index 0b8b7f3..00c2f31 100644
--- a/configs/msm8953/audio_policy_configuration.xml
+++ b/configs/msm8953/audio_policy_configuration.xml
@@ -137,7 +137,7 @@
samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">
+ <mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
@@ -279,7 +279,7 @@
<route type="mix" sink="Telephony Tx"
sources="voice_tx"/>
<route type="mix" sink="primary input"
- sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner"/>
<route type="mix" sink="surround_sound"
sources="Built-In Mic,Built-In Back Mic"/>
<route type="mix" sink="record_24"
diff --git a/configs/msmsteppe_au/sound_trigger_mixer_paths.xml b/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
index 1179ddf..8534242 100644
--- a/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
+++ b/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
@@ -230,7 +230,7 @@
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0"/>
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUIN_TDM_TX_0"/>
<ctl name="EC Reference Channels" value="Six"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
diff --git a/configs/sdm660/audio_policy_configuration.xml b/configs/sdm660/audio_policy_configuration.xml
index c5872bb..aff987d 100644
--- a/configs/sdm660/audio_policy_configuration.xml
+++ b/configs/sdm660/audio_policy_configuration.xml
@@ -155,7 +155,7 @@
<mixPort name="voip_rx" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="primary input" role="sink">
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index f4afdff..c32d1d4 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -49,6 +49,12 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -112,6 +118,12 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -178,6 +190,12 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -241,6 +259,12 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -300,6 +324,12 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -422,6 +452,12 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -555,6 +591,12 @@
LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)
@@ -622,6 +664,12 @@
LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true)
+ LOCAL_CFLAGS += -DDYNAMIC_LOG_ENABLED
+ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-log-utils
+ LOCAL_SHARED_LIBRARIES += libaudio_log_utils
+endif
+
# Kernel specific feature
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_GKI)), true)
LOCAL_CFLAGS += -DAUDIO_GKI_ENABLED
diff --git a/hal/audio_hal_plugin.h b/hal/audio_hal_plugin.h
index 595a89f..b5033c8 100644
--- a/hal/audio_hal_plugin.h
+++ b/hal/audio_hal_plugin.h
@@ -108,6 +108,7 @@
AUDIO_HAL_PLUGIN_USECASE_LINE_IN_PASSTHROUGH,
AUDIO_HAL_PLUGIN_USECASE_HDMI_IN_PASSTHROUGH,
AUDIO_HAL_PLUGIN_USECASE_PHONE_PLAYBACK,
+ AUDIO_HAL_PLUGIN_USECASE_VOICE_ACTIVATION,
AUDIO_HAL_PLUGIN_USECASE_MAX
} audio_hal_plugin_usecase_type_t;
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7c1911e..7ccef0a 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -10368,6 +10368,7 @@
pthread_mutex_lock(&adev->lock);
if (card == adev->snd_card || is_ext_device_status) {
if (is_snd_card_status && adev->card_status != status) {
+ ALOGD("%s card_status %d", __func__, status);
adev->card_status = status;
platform_snd_card_update(adev->platform, status);
audio_extn_fm_set_parameters(adev, parms);