Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baff15d4 authored Aug 03, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Aug 03, 2018

Merge "Add emulator audio policy config in /vendor not /system" into stage-dr1-aosp-master

parents a635a7a0 f36085bf

target/board/generic/device.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,14 +14,6 @@
		# limitations under the License.
		#

		# minimal configuration for audio policy.
		PRODUCT_COPY_FILES += \
		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 \

		# NFC:
		# Provide default libnfc-nci.conf file for devices that does not have one in
		# vendor/etc because aosp system image (of aosp_$arch products) is going to

target/board/generic_arm64/device.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,14 +14,6 @@
		# limitations under the License.
		#

		# minimal configuration for audio policy.
		PRODUCT_COPY_FILES += \
		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 \

		# NFC:
		# Provide default libnfc-nci.conf file for devices that does not have one in
		# vendor/etc because aosp system image (of aosp_$arch products) is going to

target/board/generic_x86/device.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,14 +14,6 @@
		# limitations under the License.
		#

		# minimal configuration for audio policy.
		PRODUCT_COPY_FILES += \
		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 \

		# NFC:
		# Provide default libnfc-nci.conf file for devices that does not have one in
		# vendor/etc because aosp system image (of aosp_$arch products) is going to

target/board/generic_x86_64/device.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,14 +14,6 @@
		# limitations under the License.
		#

		# minimal configuration for audio policy.
		PRODUCT_COPY_FILES += \
		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 \

		# NFC:
		# Provide default libnfc-nci.conf file for devices that does not have one in
		# vendor/etc because aosp system image (of aosp_$arch products) is going to

target/product/treble_common.mk

+0 −9

Original line number	Diff line number	Diff line
		@@ -31,15 +31,6 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
		PRODUCT_PACKAGES += \
		messaging

		# 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_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 \

		# Telephony:
		# Provide a default APN configuration
		PRODUCT_COPY_FILES += \