diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-10 03:03:48 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-10 03:03:48 +0000 |
| commit | b41b93d72dcb0aff320ccc13eec0b93f3508c0f7 (patch) | |
| tree | ca61bdb2dc42e300b9a61673044546f0aea5ca08 | |
| parent | 8e36e4ae522ea629adf0adf224b34cf4a786a602 (diff) | |
| parent | 7c6de17c89ab48d28e2efb1e0aa66c512b2f631b (diff) | |
| download | car-b41b93d72dcb0aff320ccc13eec0b93f3508c0f7.tar.gz | |
Snap for 4882959 from 7c6de17c89ab48d28e2efb1e0aa66c512b2f631b to pi-dr1-releaseandroid-9.0.0_r12android-9.0.0_r11pie-dr1-release
Change-Id: I98b5729b8651c8b47127ef3cc60db1fcdbd4a80f
| -rw-r--r-- | common/manifest.xml | 5 | ||||
| -rw-r--r-- | emulator/audio/car_emulator_audio.mk | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/common/manifest.xml b/common/manifest.xml index 3423c6e..279c098 100644 --- a/common/manifest.xml +++ b/common/manifest.xml @@ -98,12 +98,13 @@ <instance>default</instance> </interface> </hal> + <!-- 2.0 for car builds --> <hal format="hidl"> <name>android.hardware.broadcastradio</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>2.0</version> <interface> - <name>IBroadcastRadioFactory</name> + <name>IBroadcastRadio</name> <instance>default</instance> </interface> </hal> diff --git a/emulator/audio/car_emulator_audio.mk b/emulator/audio/car_emulator_audio.mk index a716538..b7ccbec 100644 --- a/emulator/audio/car_emulator_audio.mk +++ b/emulator/audio/car_emulator_audio.mk @@ -19,11 +19,11 @@ PRODUCT_PACKAGES += audio.primary.caremu PRODUCT_PROPERTY_OVERRIDES += ro.hardware.audio.primary=caremu PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:system/etc/a2dp_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:system/etc/usb_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \ - frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \ - device/generic/car/emulator/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml + frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + device/generic/car/emulator/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ DEVICE_PACKAGE_OVERLAYS += device/generic/car/emulator/audio/overlay |