From 8f5db33fc0f2ec9389e8f5dd210285ff1af069d8 Mon Sep 17 00:00:00 2001
From: Alexander Winkowski <dereference23@outlook.com>
Date: Sat, 25 Dec 2021 13:02:43 +0000
Subject: [PATCH] sm6250-common: Switch to prebuilt audio HAL

On OSS audio HAL there are issues like echo in calls
and low volume. Users often complain about that so switch to
prebuilt one temporary (I hope so).

Change-Id: I985a9b2c3bdb39c17bc0f861913536c121e7eeae
---
 device_framework_matrix.xml | 8 ++++++++
 manifest.xml                | 5 +++++
 proprietary-files.txt       | 6 ++++++
 vendor.prop                 | 9 +++++++++
 4 files changed, 28 insertions(+)

diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 4800388..fec85e2 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -126,6 +126,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.audiohalext</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAudioHalExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.bluetooth_audio</name>
         <version>2.0</version>
diff --git a/manifest.xml b/manifest.xml
index 7f201ad..920605a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -150,6 +150,11 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::IAlarm/default</fqname>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.audiohalext</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.0::IAudioHalExt/default</fqname>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.bluetooth_audio</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 2d0ac62..e8bbf60 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -74,13 +74,19 @@ vendor/lib64/vendor.qti.hardware.alarm@1.0.so
 
 # Audio
 vendor/lib/btaudio_offload_if.so
+vendor/lib/hw/audio.primary.atoll.so
+vendor/lib/hw/vendor.qti.hardware.audiohalext@1.0-impl.so
+vendor/lib/liba2dpoffload.so
 vendor/lib/libadm.so
 vendor/lib/libaudioconfigstore.so
+vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudioparsers.so
 vendor/lib/libdrc.so
 vendor/lib/libhdmipassthru.so
 vendor/lib/libqtigef.so
+vendor/lib/libssrec.so
 vendor/lib/libsurround_3mic_proc.so
+vendor/lib/vendor.qti.hardware.audiohalext@1.0.so
 
 # Audio FX modules
 vendor/lib/soundfx/libasphere.so
diff --git a/vendor.prop b/vendor.prop
index f66cf4e..ec59893 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -15,6 +15,15 @@ persist.vendor.audio.spv3.enable=true
 persist.vendor.audio.voicecall.speaker.stereo=false
 ro.vendor.audio.sdk.fluencetype=fluence
 ro.vendor.audio.sdk.ssr=false
+ro.vendor.audio.spk.clean=true
+ro.vendor.audio.soundfx.type=mi
+ro.vendor.audio.vocal.support=false
+ro.vendor.audio.surround.support=false
+ro.vendor.audio.spk.stereo=false
+ro.vendor.audio.scenario.support=false
+ro.vendor.audio.sfx.scenario=false
+ro.vendor.audio.sfx.earadj=false
+ro.vendor.audio.soundfx.usb=true
 vendor.audio.adm.buffering.ms=2
 vendor.audio.capture.enforce_legacy_copp_sr=true
 vendor.audio.dolby.ds2.enabled=false