Upgrade audio related HALs

Bug: 153579444
Test: boot, check if audio works
Signed-off-by: Roman Kiryanov <rkir@google.com>
Merged-In: I3d862d1c7b9e1ffb9dba5330699c65331102724c
Change-Id: I7ccb3c4e2f960c0646d26890e372e8c75c7c189d
diff --git a/manifest.xml b/manifest.xml
index baf68cb..f93fbba 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -35,7 +35,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>5.0</version>
+        <version>6.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
@@ -71,7 +71,7 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>5.0</version>
+        <version>6.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -129,7 +129,7 @@
     <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>2.2</version>
         <interface>
             <name>ISoundTriggerHw</name>
             <instance>default</instance>
diff --git a/vendor.mk b/vendor.mk
index 9a728f9..2c788e9 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -91,9 +91,9 @@
 PRODUCT_PACKAGES += \
     audio.r_submix.default \
     android.hardware.audio.service \
-    android.hardware.audio@5.0-impl:32 \
-    android.hardware.audio.effect@5.0-impl:32 \
-    android.hardware.soundtrigger@2.0-impl
+    android.hardware.audio@6.0-impl:32 \
+    android.hardware.audio.effect@6.0-impl:32 \
+    android.hardware.soundtrigger@2.2-impl
 
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.1-service.sim \