diff options
| author | Hongwei Wang <hwwang@google.com> | 2018-07-09 20:08:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-09 20:08:58 +0000 |
| commit | 7c6de17c89ab48d28e2efb1e0aa66c512b2f631b (patch) | |
| tree | ca61bdb2dc42e300b9a61673044546f0aea5ca08 | |
| parent | ac234ac841ecd53c977cf4181918e64eb04359b1 (diff) | |
| parent | b9d22fadcb7f5414579a83bba6685c8fe360df17 (diff) | |
| download | car-pie-qpr3-b-release.tar.gz | |
Merge "Overrides audio policy configurations in vendor/etc" into pi-devandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-dev
| -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 |