commit d444436b53e0fc3437bf4bda1edc060ecadce88a
author Hayden Gomes <haydengomes@google.com> Wed Apr 29 22:00:48 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 29 22:00:48 2020 +0000
tree 78ece6a71f25a269f1e50ddffcd942f988ffe39d
parent 6665d5a20c0767359bd96ec8eaa4cc882a8d2ed4
parent 4ab310e7eed1438b35078adbfd296d32d1b50805

Merge changes from topic "Fixing CF Auto audiocontrol" into rvc-dev

* changes:
  Updating to audiocontrol@2.0
  Including default implementation of audiocontrol@1.0

shared/auto/device.mk

diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 9b7c05a..0e6912c 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -65,6 +65,12 @@
 # Broadcast Radio
 PRODUCT_PACKAGES += android.hardware.broadcastradio@2.0-service
 
+# AudioControl HAL
+ifeq ($(LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE),)
+    LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE := android.hardware.automotive.audiocontrol@2.0-service
+endif
+PRODUCT_PACKAGES += $(LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE)
+
 # DRM HAL
 PRODUCT_PACKAGES += android.hardware.drm@1.3-service.clearkey
 

shared/auto/manifest.xml

diff --git a/shared/auto/manifest.xml b/shared/auto/manifest.xml
index 2c1361e..d115dbd 100644
--- a/shared/auto/manifest.xml
+++ b/shared/auto/manifest.xml
@@ -10,15 +10,6 @@
 -->
 <!-- Android Auto Embedded specific HALs-->
 <manifest version="1.0" type="device" target-level="5">
-    <hal format="hidl">
-        <name>android.hardware.automotive.audiocontrol</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAudioControl</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <!-- FIXME: Implement automotive.evs HAL
     <hal format="hidl">
         <name>android.hardware.automotive.evs</name>