From 824be3531e92de953bc39cdddcf9bb33dc6edbbe Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sat, 1 Oct 2022 23:44:16 +0200
Subject: [PATCH] msm8974-common: Switch audio HAL to V7

---
 manifest.xml | 8 ++++----
 msm8974.mk   | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 014f949..fb91934 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,8 +1,8 @@
 <manifest version="1.0" type="device" target-level="legacy">
     <hal format="hidl">
         <name>android.hardware.audio</name>
-        <transport arch="32">passthrough</transport>
-        <version>5.0</version>
+        <transport>hwbinder</transport>
+        <version>7.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -10,8 +10,8 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
-        <transport arch="32">passthrough</transport>
-        <version>5.0</version>
+        <transport>hwbinder</transport>
+        <version>7.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
diff --git a/msm8974.mk b/msm8974.mk
index 90746e4..3c3d940 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -47,8 +47,10 @@ PRODUCT_COPY_FILES += \
 
 # Audio
 PRODUCT_PACKAGES += \
-    android.hardware.audio@5.0-impl \
-    android.hardware.audio.effect@5.0-impl \
+    android.hardware.audio.service \
+    android.hardware.audio@7.0-impl:32 \
+    android.hardware.audio.effect@7.0-impl:32 \
+    audio.bluetooth.default \
     audio.primary.msm8974 \
     audio.r_submix.default \
     audio.usb.default \