commit 5883370accdc00ac6896b06e8de6db13271eaf6a
author huans <huans@google.com> Mon Jun 18 14:45:46 2018 -0700
committer huans <huans@google.com> Fri Jun 22 10:19:15 2018 -0700
tree 39dd8108c2726add85c4771fc52ec49013358aeb
parent 1774ece029cf21d177a6bed4cb86ade6558d64b0

Update to audio 4.0 hal interface

Bug: 110368387
Test: run vts -m VtsHalAudioEffectV4_0Target
Change-Id: I3ea3293f17b671184b2d10e182d38a318cf9be32

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 413042d..6594133 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -19,7 +19,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
@@ -46,7 +46,7 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>

vendor.mk

diff --git a/vendor.mk b/vendor.mk
index 2db5ec8..c68aaa7 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -68,8 +68,8 @@
     SdkSetup
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-impl \
-    android.hardware.audio.effect@2.0-impl \
+    android.hardware.audio@4.0-impl:32 \
+    android.hardware.audio.effect@4.0-impl:32 \
     android.hardware.broadcastradio@1.1-service \
     android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl
@@ -153,7 +153,7 @@
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.software.autofill.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.autofill.xml \
-    frameworks/av/media/libeffects/data/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
+    frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
     device/generic/goldfish/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
     frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \