From 0af5cf7c3c789eca756579f39ac5f6ef12b4e16a Mon Sep 17 00:00:00 2001
From: Jeferson <jroliveira.oliveira301@gmail.com>
Date: Sat, 17 Apr 2021 21:02:09 +0200
Subject: [PATCH] msm8953-common: Downrev audio to 4.0

* Audio v6 has issues related with setMicrophoneFieldDimension, killing audio input causing
  signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x0
* Kill soundtrigger while we are it too

Change-Id: Iff802131e67ca6cb507f5a3d3d850ad153288b83
---
 manifest.xml | 13 ++-----------
 msm8953.mk   |  9 ++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 983ff1f..e9a6a51 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,25 +2,16 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>6.0</version>
+        <version>4.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
-        <version>2.2</version>
-        <interface>
-            <name>ISoundTriggerHw</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>6.0</version>
+        <version>4.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
diff --git a/msm8953.mk b/msm8953.mk
index c039cc2..715a326 100644
--- a/msm8953.mk
+++ b/msm8953.mk
@@ -29,11 +29,10 @@ PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH)
 
 # Audio
 PRODUCT_PACKAGES += \
-    android.hardware.audio@6.0-impl_32 \
-    android.hardware.audio.service_32 \
-    android.hardware.audio.effect@6.0-impl_32 \
-    android.hardware.soundtrigger@2.2-impl_32 \
-    android.hardware.soundtrigger@2.2-service \
+    android.hardware.audio@4.0-impl \
+    android.hardware.audio.service \
+    android.hardware.audio.effect@4.0-impl \
+    android.hardware.audio.effect@2.0-service \
     audiod \
     audio.a2dp.default \
     audio.r_submix.default \