diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml
deleted file mode 100644
index b2620d7..0000000
--- a/audio/audio_effects.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf
deleted file mode 100644
index e74eff8..0000000
--- a/audio/audio_io_policy.conf
+++ /dev/null
@@ -1,136 +0,0 @@
-# List of profiles for the output device session where stream is routed.
-# A stream opened with the inputs attributes which match the "flags" and
-# "formats" as specified in the profile is routed to a device at
-# sample rate specified under "sampling_rates" and bit width under
-# "bit_width" and the topology extracted from the acdb data against
-# the "app_type".
-#
-# the flags and formats are specified using the strings corresponding to
-# enums in audio.h and audio_policy.h. They are concatenated with "|"
-# without space or "\n".
-# the flags and formats should match the ones in "audio_policy.conf"
-
-outputs {
-#ifdef VENDOR_EDIT
-#if OP_FEATURE_MM_24BIT == 1
-#liuhaituo@MM.Audio, 2019/07/15, use 24bit to playback
- default {
- flags AUDIO_OUTPUT_FLAG_PRIMARY
- formats AUDIO_FORMAT_PCM_24_BIT_PACKED
- sampling_rates 48000
- bit_width 24
- app_type 69937
- }
-#else
-# default {
-# flags AUDIO_OUTPUT_FLAG_PRIMARY
-# formats AUDIO_FORMAT_PCM_16_BIT
-# sampling_rates 48000
-# bit_width 16
-# app_type 69937
-# }
-#endif
-#endif
- proaudio {
- flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW
- formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 48000
- bit_width 16
- app_type 69943
- }
- voip_rx {
- flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT
- formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 8000|16000|32000|48000
- bit_width 16
- app_type 69946
- }
-#ifdef VENDOR_EDIT
-#if OP_FEATURE_MM_24BIT == 1
-#liuhaituo@MM.Audio, 2019/07/15, use 24bit to playback
- deep_buffer {
- flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
- formats AUDIO_FORMAT_PCM_24_BIT_PACKED
- sampling_rates 48000
- bit_width 24
- app_type 69936
- }
-#else
-# deep_buffer {
-# flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
-# formats AUDIO_FORMAT_PCM_16_BIT
-# sampling_rates 48000
-# bit_width 16
-# app_type 69936
-# }
-#endif
-#endif
- direct_pcm_16 {
- flags AUDIO_OUTPUT_FLAG_DIRECT
- formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT
- sampling_rates 44100|48000|88200|96000|176400|192000
- bit_width 16
- app_type 69936
- }
- direct_pcm_24 {
- flags AUDIO_OUTPUT_FLAG_DIRECT
- formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT
- sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000
- bit_width 24
- app_type 69940
- }
- direct_pcm_32 {
- flags AUDIO_OUTPUT_FLAG_DIRECT
- formats AUDIO_FORMAT_PCM_32_BIT
- sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000
- bit_width 32
- app_type 69942
- }
- compress_passthrough {
- flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH
- formats AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD
- sampling_rates 32000|44100|48000|88200|96000|176400|192000|352800
- bit_width 16
- app_type 69941
- }
- compress_offload_16 {
- flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
- formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2
- sampling_rates 44100|48000|88200|96000|176400|192000
- bit_width 16
- app_type 69936
- }
- compress_offload_24 {
- flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
- formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO
- sampling_rates 44100|48000|88200|96000|176400|192000
- bit_width 24
- app_type 69940
- }
-}
-
-inputs {
- record_16bit {
- formats AUDIO_FORMAT_PCM_16_BIT
- #ifndef VENDOR_EDIT
- #yewenliang@MM.Audio, 2020/04/09, remove 11025 series sample rate for normal record
- #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000
- #else
- sampling_rates 8000|16000|32000|48000|96000|192000
- #endif
- bit_width 16
- app_type 69938
- }
- record_24bit {
- formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT
- sampling_rates 44100|48000|88200|96000|176400|192000
- bit_width 24
- app_type 69948
- }
- record_32bit {
- formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT
- sampling_rates 44100|48000|88200|96000|176400|192000
- bit_width 32
- app_type 69949
- }
-}
diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml
index c98e38b..be6db03 100644
--- a/audio/audio_platform_info_intcodec.xml
+++ b/audio/audio_platform_info_intcodec.xml
@@ -79,7 +79,9 @@
+
+
@@ -94,10 +96,17 @@
+
+
+
+
+
+
+
@@ -110,6 +119,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,136 +157,197 @@
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -276,7 +364,6 @@
-
@@ -314,16 +401,20 @@
+
+
-
-
-
+
+
+
+
+
@@ -337,7 +428,6 @@
-
@@ -349,29 +439,105 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
deleted file mode 100644
index 85c9b5d..0000000
--- a/audio/audio_policy_configuration.xml
+++ /dev/null
@@ -1,436 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Earpiece
- - Speaker
- - Telephony Tx
- - Built-In Mic
- - Built-In Back Mic
- - FM Tuner
- - Telephony Rx
-
- Speaker
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/audio_tuning_mixer.txt b/audio/audio_tuning_mixer.txt
deleted file mode 100644
index 474f18b..0000000
--- a/audio/audio_tuning_mixer.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (c) 2019, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#RAS_TEST_SPKR_PHONE_SPKR_STEREO
-acdb_dev_id:136
-!Playback
-Rxdevice:0
-
-enable
-WSA_CDC_DMA_RX_0 Channels:Two
-WSA RX0 MUX:AIF1_PB
-WSA RX1 MUX:AIF1_PB
-WSA_RX0 INP0:RX0
-WSA_RX1 INP0:RX1
-WSA_COMP1 Switch:1
-WSA_COMP2 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
-WSA_RX0 Digital Volume:62
-WSA_RX1 Digital Volume:62
-WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1
-
-disable
-WSA RX0 MUX:ZERO
-WSA RX1 MUX:ZERO
-WSA_RX0 INP0:ZERO
-WSA_RX1 INP0:ZERO
-WSA_COMP1 Switch:0
-WSA_COMP2 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
-WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0
-
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
index f5c2a1e..edc6fe7 100644
--- a/audio/sound_trigger_mixer_paths.xml
+++ b/audio/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
-
+
@@ -82,12 +82,16 @@
+
+
-
-
+
+
-
-
+
+
+
+
@@ -156,104 +160,92 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -261,29 +253,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -318,8 +315,8 @@
+
-
@@ -331,7 +328,7 @@
-
+
diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
index 9008453..99c9185 100644
--- a/audio/sound_trigger_platform_info.xml
+++ b/audio/sound_trigger_platform_info.xml
@@ -1,5 +1,5 @@
-
+
@@ -37,10 +37,11 @@
+
-
+
@@ -49,12 +50,22 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -128,7 +139,6 @@
-
@@ -140,7 +150,7 @@
-
+
@@ -159,7 +169,7 @@
-
+
@@ -403,7 +413,7 @@
-
+
diff --git a/common.mk b/common.mk
index 8d4e1e0..446a182 100644
--- a/common.mk
+++ b/common.mk
@@ -148,12 +148,16 @@ PRODUCT_PACKAGES += \
libvisualizer \
libvolumelistener
+AUDIO_HAL_DIR := hardware/qcom-caf/sm8250/audio
+
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
- $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
+ $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml \
+ $(AUDIO_HAL_DIR)/configs/kona/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+ $(AUDIO_HAL_DIR)/configs/kona/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
+ $(AUDIO_HAL_DIR)/configs/kona/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ $(AUDIO_HAL_DIR)/configs/kona/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
+ $(AUDIO_HAL_DIR)/configs/kona/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
$(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_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
$(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