From cfec3135eda0ad372e3fdf3215ee83f25e8c353a Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Fri, 22 Nov 2019 10:56:29 -0800
Subject: [PATCH] g12: 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
---
 g12.mk       | 4 ++--
 manifest.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/g12.mk b/g12.mk
index df18331..51c2055 100644
--- a/g12.mk
+++ b/g12.mk
@@ -19,11 +19,11 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio@5.0-impl \
+    android.hardware.audio@6.0-impl \
     android.hardware.audio@7.0.vendor \
     android.hardware.audio@7.0-util.vendor \
     android.hardware.audio.common@7.0-util \
-    android.hardware.audio.effect@5.0-impl \
+    android.hardware.audio.effect@6.0-impl \
     android.hardware.audio.effect@7.0-util.vendor \
     av-types-aidl-cpp.vendor \
     libaudiofoundation.vendor
diff --git a/manifest.xml b/manifest.xml
index a34274c..bc10fb2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,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>
@@ -11,7 +11,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>
-- 
2.20.1