From 528181baf5e4f724c850faec95aa34ca362711f2 Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Fri, 22 Nov 2019 10:56:29 -0800
Subject: [PATCH] exynos9610: Switch to Audio HAL V6

Switch to Audio HAL V6

Bug: 141989952
Test: atest VtsHalAudioV6_0TargetTest
      atest VtsHalAudioEffectV6_0TargetTest
            manual audio "smoke" test on taimen and walleye

Change-Id: Ieb1cc5c7fdcc5416a328a0a5c4a1996258b81ac8
---
 common.mk    | 6 +++---
 manifest.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common.mk b/common.mk
index bfc6dad..a958ca7 100644
--- a/common.mk
+++ b/common.mk
@@ -37,10 +37,10 @@ PRODUCT_PACKAGES += \
 
 # Audio
 PRODUCT_PACKAGES += \
-    android.hardware.audio@4.0.vendor \
-    android.hardware.audio.effect@4.0-impl \
+    android.hardware.audio@6.0.vendor \
+    android.hardware.audio.effect@6.0-impl \
     android.hardware.audio@2.0-service \
-    android.hardware.audio@4.0-impl \
+    android.hardware.audio@6.0-impl \
     android.hardware.bluetooth.audio-impl \
     android.hardware.soundtrigger@2.0-impl \
     audio.bluetooth.default \
diff --git a/manifest.xml b/manifest.xml
index b951a3c..eaa24c9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,22 +2,22 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>6.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@4.0::IDevicesFactory/default</fqname>
+        <fqname>@6.0::IDevicesFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>6.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@4.0::IEffectsFactory/default</fqname>
+        <fqname>@6.0::IEffectsFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.biometrics.fingerprint</name>
-- 
2.20.1