From 924e705c85d7636191adf5be41a3ae6817e18ee7 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Mon, 12 Jun 2017 18:56:50 +0800 Subject: [PATCH] Fix audio policy configuration for generic targets Changes in this CL: 1. Use ":=", instead of "+=", for PRODUCT_COPY_FILES so previous audio policy related settings won't be overwritten. 2. Use basic audio policy XML files provided by audio team as default. Bug: 62524944 Test: check if the XML files for audio policy configuration are under /system/etc and devices with generic system imagei, but without such configuration under /vendor/etc can boot with audio working. Change-Id: I4ccffdfb131a9d2445d9c2f52a22ffcc97884479 --- target/product/treble_common.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index 92876ef0c..15e1007f2 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -170,14 +170,13 @@ USE_XML_AUDIO_POLICY_CONF := 1 # The following policy XML files are used as fallback for # vendors/devices not using XML to configure audio policy. PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml \ - 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/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_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 \ # May need to review why the followings are needed in generic system image. -PRODUCT_COPY_FILES := \ +PRODUCT_COPY_FILES += \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml