commit 5f16d60888d63af97edf45fcb6eb0f589b698440
author Calvin Huang <calhuang@google.com> Wed Dec 04 14:36:52 2019 -0800
committer Calvin Huang <calhuang@google.com> Wed Dec 04 17:25:43 2019 -0800
tree 62e3caed8a384204649b5c0957049ca216461e93
parent cb2e4afc90075c4839efe9eb92924602931095cd

Fix gcar_hl_emu_x86 crash on master

Remove broadcastradio@.2.0 since it's keep crashing.
Update version number for rest of hals
Update bluetooth.sim verison number

Fix: 144794614
Test: System should boot
Change-Id: Icc7f59e06df5779267ca8dd43ce2f2e2bf577eb9

common/car.mk

diff --git a/common/car.mk b/common/car.mk
index eec9405..6f2751d 100644
--- a/common/car.mk
+++ b/common/car.mk
@@ -15,12 +15,12 @@
 #
 
 # Auto modules
+# TODO: Add broadcastradio@.2.0 back once it's stable b/145694104
 PRODUCT_PACKAGES += \
     android.hardware.automotive.vehicle@2.0-service \
     android.hardware.automotive.audiocontrol@1.0-service \
-    android.hardware.bluetooth@1.0-service.sim \
+    android.hardware.bluetooth@1.1-service.sim \
     android.hardware.bluetooth.audio@2.0-impl \
-    android.hardware.broadcastradio@2.0-service
 
 # Emulator configuration
 PRODUCT_COPY_FILES += \

common/manifest.xml

diff --git a/common/manifest.xml b/common/manifest.xml
index 935cf23..8ac10bf 100644
--- a/common/manifest.xml
+++ b/common/manifest.xml
@@ -20,7 +20,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>5.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
@@ -47,7 +47,7 @@
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IBluetoothHci</name>
             <instance>default</instance>
@@ -65,7 +65,7 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>5.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -120,11 +120,10 @@
     <hal format="hidl">
         <name>android.hardware.broadcastradio</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>1.1</version>
         <interface>
-            <name>IBroadcastRadio</name>
-            <instance>amfm</instance>
-            <instance>dab</instance>
+            <name>IBroadcastRadioFactory</name>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -134,6 +133,7 @@
         <interface>
             <name>ICameraProvider</name>
             <instance>legacy/0</instance>
+            <instance>internal/0</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -213,4 +213,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+        <hal format="hidl">
+        <name>android.hardware.authsecret</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAuthSecret</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+
 </manifest>