diff --git a/BoardConfig.mk b/BoardConfig.mk
index 11c4785..1bc88ed 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -47,7 +47,13 @@ TARGET_KERNEL_VERSION := 4.9
# Audio
USE_CUSTOM_AUDIO_POLICY := 1
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
-AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
+AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true
+AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY := true
+AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true
+AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
+AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_HDMI_SPK := true
AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
BOARD_SUPPORTS_SOUND_TRIGGER := true
diff --git a/audio/audio_platform_info_i2s.xml b/audio/audio_platform_info_i2s.xml
deleted file mode 100644
index 5458b60..0000000
--- a/audio/audio_platform_info_i2s.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml
new file mode 100644
index 0000000..3d45586
--- /dev/null
+++ b/audio/audio_platform_info_intcodec.xml
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/audio_tuning_mixer.txt b/audio/audio_tuning_mixer.txt
new file mode 100644
index 0000000..fd48369
--- /dev/null
+++ b/audio/audio_tuning_mixer.txt
@@ -0,0 +1,41 @@
+#RAS_TEST_SPKR_PHONE_SPKR_STEREO
+acdb_dev_id:136
+!Playback
+Rxdevice:0
+
+enable
+INT4_MI2S_RX Channels:Two
+RX4 MIX1 INP1:RX4
+RX5 MIX1 INP1:RX5
+COMP1 Switch:1
+COMP2 Switch:1
+SpkrLeft COMP Switch:1
+SpkrLeft BOOST Switch:1
+SpkrLeft VISENSE Switch:1
+SpkrLeft SWR DAC_Port Switch:1
+SpkrRight COMP Switch:1
+SpkrRight BOOST Switch:1
+SpkrRight VISENSE Switch:1
+SpkrRight SWR DAC_Port Switch:1
+SpkrLeft WSA PA Mute:0
+SpkrRight WSA PA Mute:0
+INT4_MI2S_RX Audio Mixer MultiMedia1:1
+
+disable
+INT4_MI2S_RX Channels:One
+RX4 MIX1 INP1:ZERO
+RX5 MIX1 INP1:ZERO
+COMP1 Switch:0
+COMP2 Switch:0
+SpkrLeft COMP Switch:0
+SpkrLeft BOOST Switch:0
+SpkrLeft VISENSE Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+SpkrRight COMP Switch:0
+SpkrRight BOOST Switch:0
+SpkrRight VISENSE Switch:0
+SpkrRight SWR DAC_Port Switch:0
+SpkrLeft WSA PA Mute:0
+SpkrRight WSA PA Mute:0
+INT4_MI2S_RX Audio Mixer MultiMedia1:0
+
diff --git a/audio/audio_tuning_mixer_tavil.txt b/audio/audio_tuning_mixer_tavil.txt
deleted file mode 100644
index 6c1c864..0000000
--- a/audio/audio_tuning_mixer_tavil.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-#ANC_TEST_P_PATH_MIC_STEREO Capture
-acdb_dev_id:85
-!Capture
-Txdevice:0
-
-enable
-AIF1_CAP Mixer SLIM TX7:1
-AIF1_CAP Mixer SLIM TX8:1
-CDC_IF TX7 MUX:DEC7
-ADC MUX7:DMIC
-DMIC MUX7:DMIC4
-CDC_IF TX8 MUX:DEC8
-ADC MUX8:DMIC
-DMIC MUX8:DMIC0
-SLIM_0_TX Channels:Two
-MultiMedia1 Mixer SLIM_0_TX:1
-
-disable
-MultiMedia1 Mixer SLIM_0_TX:0
-AIF1_CAP Mixer SLIM TX7:0
-AIF1_CAP Mixer SLIM TX8:0
-CDC_IF TX7 MUX:ZERO
-CDC_IF TX8 MUX:ZERO
-DMIC MUX7:ZERO
-DMIC MUX8:ZERO
-
-#ANC_TEST_S_PATH_MIC_STEREO Capture
-acdb_dev_id:88
-!Capture
-Txdevice:0
-
-enable
-AIF1_CAP Mixer SLIM TX7:1
-AIF1_CAP Mixer SLIM TX8:1
-CDC_IF TX7 MUX:DEC7
-ADC MUX7:ANC_FB_TUNE1
-ADC MUX10:DMIC
-DMIC MUX10:DMIC0
-CDC_IF TX8 MUX:DEC8
-ADC MUX8:ANC_FB_TUNE2
-ADC MUX12:DMIC
-DMIC MUX12:DMIC0
-ANC0 FB MUX:ANC_IN_EAR_SPKR
-ANC OUT EAR SPKR Enable Switch:1
-SLIM_0_TX Channels:Two
-MultiMedia1 Mixer SLIM_0_TX:1
-
-disable
-MultiMedia1 Mixer SLIM_0_TX:0
-AIF1_CAP Mixer SLIM TX7:0
-AIF1_CAP Mixer SLIM TX8:0
-CDC_IF TX7 MUX:ZERO
-CDC_IF TX8 MUX:ZERO
-ADC MUX7:DMIC
-ADC MUX8:DMIC
-DMIC MUX10:ZERO
-DMIC MUX12:ZERO
-ANC0 FB MUX:ZERO
-ANC OUT EAR SPKR Enable Switch:0
-
-
-#ANC_TEST_E_PATH_MIC_STEREO Capture
-acdb_dev_id:91
-!Capture
-Txdevice:0
-
-enable
-AIF1_CAP Mixer SLIM TX7:1
-AIF1_CAP Mixer SLIM TX8:1
-CDC_IF TX7 MUX:DEC7
-ADC MUX7:ANC_FB_TUNE1
-ADC MUX10:DMIC
-DMIC MUX10:DMIC4
-CDC_IF TX8 MUX:DEC8
-ADC MUX8:ANC_FB_TUNE2
-ADC MUX12:DMIC
-DMIC MUX12:DMIC4
-ANC0 FB MUX:ANC_IN_EAR_SPKR
-ANC OUT EAR SPKR Enable Switch:1
-SLIM_0_TX Channels:Two
-MultiMedia1 Mixer SLIM_0_TX:1
-
-disable
-MultiMedia1 Mixer SLIM_0_TX:0
-AIF1_CAP Mixer SLIM TX7:0
-AIF1_CAP Mixer SLIM TX8:0
-CDC_IF TX7 MUX:ZERO
-CDC_IF TX8 MUX:ZERO
-ADC MUX7:DMIC
-ADC MUX8:DMIC
-DMIC MUX10:ZERO
-DMIC MUX12:ZERO
-ANC0 FB MUX:ZERO
-ANC OUT EAR SPKR Enable Switch:0
-
-
-#ANC_TEST_S_PATH_HANDSET_SPKR_ANC_MONO
-acdb_dev_id:86
-!Playback
-Rxdevice:0
-
-enable
-ANC Function:ON
-SLIM RX0 MUX:AIF1_PB
-SLIM_0_RX Channels:One
-RX INT7_1 MIX1 INP0:RX0
-SpkrLeft SWR DAC_Port Switch:1
-ANC Slot:7
-ANC OUT EAR SPKR Enable Switch:1
-ANC SPKR PA Enable Switch:1
-SpkrLeft WSA PA Gain:G_6_DB
-SLIMBUS_0_RX Audio Mixer MultiMedia1:1
-
-disable
-SLIMBUS_0_RX Audio Mixer MultiMedia1:0
-SpkrLeft WSA PA Gain:G_0_DB
-ANC SPKR PA Enable Switch:0
-ANC OUT EAR SPKR Enable Switch:0
-SpkrLeft SWR DAC_Port Switch:0
-ANC Slot:0
-SLIM RX0 MUX:ZERO
-RX INT7_1 MIX1 INP0:ZERO
-ANC Function:OFF
-
-#ANC_TEST_E_PATH_HANDSET_SPKR_ANC_MONO
-acdb_dev_id:89
-!Playback
-Rxdevice:0
-
-enable
-ANC Function:ON
-SLIM RX0 MUX:AIF1_PB
-SLIM_0_RX Channels:One
-RX INT7_1 MIX1 INP0:RX0
-SpkrLeft SWR DAC_Port Switch:1
-ANC Slot:8
-ANC OUT EAR SPKR Enable Switch:1
-ANC SPKR PA Enable Switch:1
-SpkrLeft WSA PA Gain:G_6_DB
-SLIMBUS_0_RX Audio Mixer MultiMedia1:1
-
-disable
-SLIMBUS_0_RX Audio Mixer MultiMedia1:0
-SpkrLeft WSA PA Gain:G_0_DB
-ANC SPKR PA Enable Switch:0
-ANC OUT EAR SPKR Enable Switch:0
-SpkrLeft SWR DAC_Port Switch:0
-ANC Slot:0
-SLIM RX0 MUX:ZERO
-RX INT7_1 MIX1 INP0:ZERO
-ANC Function:OFF
-
-#RAS_TEST_SPKR_PHONE_SPKR_STEREO
-acdb_dev_id:136
-!Playback
-Rxdevice:0
-
-enable
-SLIM RX0 MUX:AIF1_PB
-SLIM RX1 MUX:AIF1_PB
-CDC_IF RX0 MUX:SLIM RX0
-CDC_IF RX1 MUX:SLIM RX1
-SLIM_0_RX Channels:Two
-RX INT7_1 MIX1 INP0:RX0
-RX INT8_1 MIX1 INP0:RX1
-COMP7 Switch:1
-COMP8 Switch:1
-SpkrLeft COMP Switch:1
-SpkrRight COMP Switch:1
-SpkrLeft BOOST Switch:1
-SpkrRight BOOST Switch:1
-SpkrLeft VISENSE Switch:1
-SpkrRight VISENSE Switch:1
-SpkrLeft SWR DAC_Port Switch:1
-SpkrRight SWR DAC_Port Switch:1
-SLIMBUS_0_RX Audio Mixer MultiMedia1:1
-
-disable
-SLIM RX0 MUX:ZERO
-SLIM RX1 MUX:ZERO
-RX INT7_1 MIX1 INP0:ZERO
-RX INT8_1 MIX1 INP0:ZERO
-COMP7 Switch:0
-COMP8 Switch:0
-SpkrLeft COMP Switch:0
-SpkrRight COMP Switch:0
-SpkrLeft BOOST Switch:0
-SpkrRight BOOST Switch:0
-SpkrLeft VISENSE Switch:0
-SpkrRight VISENSE Switch:0
-SpkrLeft SWR DAC_Port Switch:0
-SpkrRight SWR DAC_Port Switch:0
-SLIMBUS_0_RX Audio Mixer MultiMedia1:0
diff --git a/audio/mixer_paths_i2s.xml b/audio/mixer_paths_i2s.xml
deleted file mode 100644
index b04d082..0000000
--- a/audio/mixer_paths_i2s.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/mixer_paths_tavil.xml b/audio/mixer_paths_mtp.xml
similarity index 57%
rename from audio/mixer_paths_tavil.xml
rename to audio/mixer_paths_mtp.xml
index 088381d..9adb74d 100644
--- a/audio/mixer_paths_tavil.xml
+++ b/audio/mixer_paths_mtp.xml
@@ -1,5 +1,5 @@
-
+
@@ -22,6 +22,7 @@
+
@@ -35,7 +36,6 @@
-
@@ -46,7 +46,7 @@
-
+
@@ -59,22 +59,32 @@
-
-
-
-
+
+
-
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,54 +104,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -160,51 +150,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
@@ -219,18 +194,20 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
@@ -242,9 +219,11 @@
-
-
-
+
+
+
+
+
@@ -257,8 +236,6 @@
-
-
@@ -278,9 +255,9 @@
-
-
-
+
+
+
@@ -296,12 +273,7 @@
-
-
-
-
-
-
+
@@ -313,8 +285,8 @@
-
-
+
+
@@ -330,206 +302,98 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -538,39 +402,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
@@ -601,55 +510,67 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -665,12 +586,12 @@
-
-
+
+
-
+
@@ -692,23 +613,13 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
+
@@ -720,35 +631,29 @@
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
+
@@ -756,9 +661,8 @@
-
-
-
+
+
@@ -774,12 +678,12 @@
-
-
+
+
-
+
@@ -801,19 +705,13 @@
-
-
-
-
-
-
-
-
+
+
@@ -825,40 +723,33 @@
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -872,12 +763,12 @@
-
-
+
+
-
+
@@ -899,21 +790,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -921,37 +806,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -967,12 +845,12 @@
-
-
+
+
-
+
@@ -994,21 +872,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1016,37 +888,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1062,12 +923,12 @@
-
-
+
+
-
+
@@ -1089,21 +950,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1111,37 +966,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1157,12 +1001,12 @@
-
-
+
+
-
+
@@ -1185,21 +1029,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1207,37 +1045,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1253,12 +1080,12 @@
-
-
+
+
-
+
@@ -1280,21 +1107,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1302,37 +1123,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1348,12 +1158,12 @@
-
-
+
+
-
+
@@ -1375,21 +1185,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1397,37 +1201,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1443,12 +1236,12 @@
-
-
+
+
-
+
@@ -1470,21 +1263,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1492,37 +1279,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1538,12 +1314,12 @@
-
-
+
+
-
+
@@ -1565,21 +1341,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1587,37 +1357,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
@@ -1633,12 +1392,12 @@
-
-
+
+
-
+
@@ -1660,21 +1419,15 @@
-
-
-
-
-
-
+
-
+
-
@@ -1682,33 +1435,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1729,27 +1467,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1766,7 +1484,7 @@
-
+
@@ -1792,14 +1510,14 @@
-
-
+
+
-
-
+
+
@@ -1926,18 +1644,18 @@
-
+
-
-
-
+
+
+
-
+
-
-
+
+
@@ -1951,18 +1669,28 @@
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
-
+
+
@@ -1982,7 +1710,7 @@
-
+
@@ -1990,14 +1718,39 @@
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -2017,7 +1770,7 @@
-
+
@@ -2025,14 +1778,39 @@
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -2052,7 +1830,7 @@
-
+
@@ -2060,23 +1838,37 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
@@ -2095,7 +1887,7 @@
-
+
@@ -2103,14 +1895,9 @@
-
-
-
-
-
-
+
@@ -2126,137 +1913,81 @@
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
@@ -2267,37 +1998,42 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
+
+
@@ -2308,32 +2044,29 @@
-
-
-
+
-
-
-
+
+
-
-
+
-
+
-
-
+
-
+
+
+
@@ -2342,116 +2075,59 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2462,11 +2138,12 @@
-
+
+
-
+
@@ -2477,22 +2154,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2505,8 +2170,23 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -2522,19 +2202,10 @@
-
-
-
-
-
-
-
-
-
@@ -2554,27 +2225,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2584,7 +2235,6 @@
-
@@ -2593,17 +2243,20 @@
-
+
-
+
+
+
+
@@ -2612,9 +2265,9 @@
-
-
-
+
+
+
@@ -2622,16 +2275,15 @@
-
-
-
-
-
+
+
+
+
@@ -2654,69 +2306,53 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -2768,20 +2404,18 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -2790,23 +2424,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2831,9 +2448,8 @@
-
-
-
+
+
@@ -2851,14 +2467,8 @@
-
-
-
-
-
-
-
+
@@ -2866,7 +2476,7 @@
-
+
@@ -2920,7 +2530,7 @@
-
+
@@ -2932,11 +2542,6 @@
-
-
-
-
-
@@ -2990,29 +2595,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3020,97 +2610,52 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -3118,11 +2663,6 @@
-
-
-
-
-
@@ -3157,33 +2697,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3219,6 +2744,10 @@
+
+
+
+
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
new file mode 100644
index 0000000..7619e26
--- /dev/null
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/sound_trigger_mixer_paths_wcd9340.xml b/audio/sound_trigger_mixer_paths_wcd9340.xml
deleted file mode 100644
index df61226..0000000
--- a/audio/sound_trigger_mixer_paths_wcd9340.xml
+++ /dev/null
@@ -1,385 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/device.mk b/device.mk
index 135e791..beb1291 100644
--- a/device.mk
+++ b/device.mk
@@ -23,32 +23,35 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-pe
# Audio
PRODUCT_PACKAGES += \
- android.hardware.audio@2.0-service \
- android.hardware.audio@6.0-impl \
- android.hardware.audio.effect@6.0-impl \
- android.hardware.soundtrigger@2.2-impl \
+ android.hardware.audio@6.0-impl:32 \
+ android.hardware.audio.effect@6.0-impl:32 \
+ android.hardware.audio.service \
+ android.hardware.soundtrigger@2.2-impl:32 \
audio.a2dp.default \
audio.r_submix.default \
audio.usb.default \
libqcompostprocbundle \
libqcomvisualizer \
libqcomvoiceprocessing \
- libvolumelistener
+ libtinycompress \
+ libvolumelistener \
+ tinymix
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
$(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+ $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \
$(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
$(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \
$(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- $(LOCAL_PATH)/audio/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \
+ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
$(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \
$(LOCAL_PATH)/audio/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
$(LOCAL_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \
$(LOCAL_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \
- $(LOCAL_PATH)/audio/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
- $(LOCAL_PATH)/audio/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt
+ $(LOCAL_PATH)/audio/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \
+ $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt
PRODUCT_COPY_FILES += \
$(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3ab45b3..e8d081a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -10,31 +10,6 @@ vendor/etc/acdbdata/MTP/MTP_Hdmi_cal.acdb
vendor/etc/acdbdata/MTP/MTP_Headset_cal.acdb
vendor/etc/acdbdata/MTP/MTP_Speaker_cal.acdb
vendor/etc/acdbdata/MTP/MTP_workspaceFile.qwsp
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_Bluetooth_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_General_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_Global_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_Handset_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_Hdmi_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_Headset_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_Speaker_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tasha-snd-card/MTP_WCD9335_workspaceFile.qwsp
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Bluetooth_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Codec_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_General_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Global_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Handset_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Hdmi_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Headset_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_Speaker_cal.acdb
-vendor/etc/acdbdata/MTP/sdm670-tavil-snd-card/MTP_WCD9340_workspaceFile.qwsp
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_Bluetooth_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_General_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_Global_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_Handset_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_Hdmi_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_Headset_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_Speaker_cal.acdb
-vendor/etc/acdbdata/QRD/sdm670-skuw-snd-card/QRD_SKUW_workspaceFile.qwsp
# ADSP
vendor/bin/adsprpcd
@@ -103,32 +78,32 @@ vendor/lib64/libscvePanorama_lite.so
vendor/lib64/vendor.qti.hardware.scve.objecttracker@1.0.so
vendor/lib64/vendor.qti.hardware.scve.panorama@1.0.so
-# Audio
-vendor/lib/libacdb-fts.so
-vendor/lib/libacdbloader.so
-vendor/lib/libacdbrtac.so
-vendor/lib/libadiertac.so
-vendor/lib/libadm.so
-vendor/lib/libaudcal.so
-vendor/lib/libaudioalsa.so
-vendor/lib/libaudioconfigstore.so
-vendor/lib/libaudioparsers.so
-vendor/lib/libaudio_log_utils.so
-vendor/lib/libdrc.so
-vendor/lib/libqtigef.so
-vendor/lib/libsurround_3mic_proc.so
-vendor/lib/libtinycompress.so
-vendor/lib64/libacdb-fts.so
-vendor/lib64/libacdbloader.so
-vendor/lib64/libacdbrtac.so
-vendor/lib64/libadiertac.so
-vendor/lib64/libaudcal.so
-vendor/lib64/libaudioalsa.so
-vendor/lib64/libaudioconfigstore.so
-vendor/lib64/libaudioparsers.so
-vendor/lib64/libaudio_log_utils.so
-vendor/lib64/libqtigef.so
-vendor/lib64/libtinycompress.so
+# Audio stock
+vendor/lib/hw/audio.primary.sdm710.so
+vendor/lib64/hw/audio.primary.sdm710.so
+vendor/firmware/mono.cnt
+vendor/firmware/tfa98xx.cnt
+
+# Audio - from LA.UM.9.8.r1-02700-SDM710.0
+vendor/lib/libacdb-fts.so|a5f687bcaa1f8a766b37685991b22d2e7674c510
+vendor/lib/libacdbloader.so|e6b48906e57001a61f3bc9852fa37b6f774d38ec
+vendor/lib/libacdbrtac.so|af5b7454db542bdbd1ff398beccb222a65112447
+vendor/lib/libadiertac.so|70cd136ab4dc4d1bbf0d7901f19a951d10ac12aa
+vendor/lib/libadm.so|61825f91c7f02e685c03d1fb78aeb3bd2d5db10b
+vendor/lib/libaudcal.so|b7a45bdcd87af35463303a23470544da54308252
+vendor/lib/libaudio_log_utils.so|7a2bb17dd61a9ad30fdbf42eb2766f06e686a66c
+vendor/lib/libaudioalsa.so|725194ef7a0eaa859dd0ef2f4c19f6e6ae9e85c9
+vendor/lib/libaudioparsers.so|0308854020da0aca45fc0a5718c907d07c6fb73f
+vendor/lib/libqtigef.so|4b8348b025f0d6e1343c1c28e6c325e968dfd973
+vendor/lib64/libacdb-fts.so|6e582a64c2665f227bedacfcaff4c8f00e53eab3
+vendor/lib64/libacdbloader.so|802f468d19347a22c407507525726e45aae48f5b
+vendor/lib64/libacdbrtac.so|dbb5cbee7abc0eb7c9d13b2743628470eaa57a15
+vendor/lib64/libadiertac.so|90323921dfe83ff07fd11d30e537711481139a14
+vendor/lib64/libaudcal.so|92504add7a1c0e8ed39976a79d22c5e5086d5623
+vendor/lib64/libaudio_log_utils.so|bbbcf112349e154613a43452b1325b2a643be7bc
+vendor/lib64/libaudioalsa.so|534d4dc07fecea0611273c745721b1ed2015a3a3
+vendor/lib64/libaudioparsers.so|1463c5ee0f2f040835386d9ccb4a4b010c5bdf58
+vendor/lib64/libqtigef.so|e77f065c124771a3204dfb793938f8fe887b6ebb
# Audio extensions
vendor/lib/liba2dpoffload.so
@@ -152,22 +127,17 @@ vendor/lib64/libspkrprot.so
# Audio FX modules
vendor/lib/soundfx/libasphere.so
-vendor/lib/soundfx/libaudiopreprocessing.so
vendor/lib/soundfx/libqcbassboost.so
+vendor/lib/soundfx/libqcompostprocbundle.so
vendor/lib/soundfx/libqcreverb.so
vendor/lib/soundfx/libqcvirt.so
vendor/lib/soundfx/libshoebox.so
vendor/lib64/soundfx/libasphere.so
-vendor/lib64/soundfx/libaudiopreprocessing.so
vendor/lib64/soundfx/libqcbassboost.so
vendor/lib64/soundfx/libqcreverb.so
vendor/lib64/soundfx/libqcvirt.so
vendor/lib64/soundfx/libshoebox.so
-# Audio - from enchilada - QKQ1.190716.003
-vendor/lib64/soundfx/libvolumelistener.so|5ea2812a582c76f7db3a7e5e4fb4cc33bbca3d9b
-vendor/lib/soundfx/libvolumelistener.so|776906b3f70c7764245e8b394fd23333aa811bfd
-
# Alarm
-product/app/PowerOffAlarm/PowerOffAlarm.apk|88544eea8cd47547bb7e6e52fae573453bea25a3
vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service|6f58edbe898a0582b02b688ec8a47a57a50707ec