diff options
| author | Calvin Huang <calhuang@google.com> | 2019-12-04 14:36:52 -0800 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2020-02-03 16:00:39 -0800 |
| commit | 2c2b2d898cad7e196e51baa7ab741aac4d9b0d53 (patch) | |
| tree | bc1e329700bd2aefc49a452fc7a11cc52e610fbb /common | |
| parent | 30b9b243e9f290cc3641143c38d0c96f916319a1 (diff) | |
| download | device_generic_car-2c2b2d898cad7e196e51baa7ab741aac4d9b0d53.tar.gz device_generic_car-2c2b2d898cad7e196e51baa7ab741aac4d9b0d53.tar.bz2 device_generic_car-2c2b2d898cad7e196e51baa7ab741aac4d9b0d53.zip | |
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
Merged-In: Icc7f59e06df5779267ca8dd43ce2f2e2bf577eb9
Diffstat (limited to 'common')
| -rw-r--r-- | common/car.mk | 4 | ||||
| -rw-r--r-- | common/manifest.xml | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/common/car.mk b/common/car.mk index 509694f..3d9ed31 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 += \ diff --git a/common/manifest.xml b/common/manifest.xml index 403812b..118f20e 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"> @@ -241,4 +241,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> |