From 2a9beddce4520d39309dc4a9c88586b226a449e9 Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Fri, 22 Nov 2019 10:56:29 -0800
Subject: [PATCH] universal7885: 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
Signed-off-by: SamarV-121 <samarvispute121@gmail.com>
---
 manifest.xml            | 8 ++++----
 universal7904-common.mk | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 36a6367..45cee7f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,22 +2,22 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>6.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@2.0::IDevicesFactory/default</fqname>
+        <fqname>@6.0::IDevicesFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>6.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@2.0::IEffectsFactory/default</fqname>
+        <fqname>@6.0::IEffectsFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.biometrics.fingerprint</name>
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 14c5849..e8ed9eb 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -9,9 +9,9 @@ PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 TARGET_EXCLUDES_AUDIOFX := true
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-impl \
+    android.hardware.audio@6.0-impl \
     android.hardware.audio.service \
-    android.hardware.audio.effect@2.0-impl \
+    android.hardware.audio.effect@6.0-impl \
     libalsautils \
     libeffects \
     libnbaio_mono \