Merge "engine configurable: add conf for product without devices" into nyc-dev (b4eea9fa) · Commits · e / os / android_frameworks_av

services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk

+52 −0

Original line number	Diff line number	Diff line
		@@ -107,4 +107,56 @@ LOCAL_SRC_FILES := Settings/$(LOCAL_MODULE_STEM)
		include $(BUILD_PREBUILT)
		endif # pfw_rebuild_settings

		######### Policy PFW Settings - No Output #########
		include $(CLEAR_VARS)
		LOCAL_MODULE := parameter-framework.policy.no-output
		LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
		LOCAL_ADDITIONAL_DEPENDENCIES := \
		PolicyClass.xml \
		PolicySubsystem.xml \
		ParameterFrameworkConfigurationPolicy.xml

		PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
		PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
		PFW_EDD_FILES := \
		$(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \
		$(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
		$(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
		$(LOCAL_PATH)/Settings/device_for_input_source.pfw \
		$(LOCAL_PATH)/Settings/volumes.pfw

		include $(BUILD_PFW_SETTINGS)

		######### Policy PFW Settings - No Input #########
		include $(CLEAR_VARS)
		LOCAL_MODULE := parameter-framework.policy.no-input
		LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
		LOCAL_ADDITIONAL_DEPENDENCIES := \
		PolicyClass.xml \
		PolicySubsystem.xml \
		ParameterFrameworkConfigurationPolicy.xml

		PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
		PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
		PFW_EDD_FILES := \
		$(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
		$(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
		$(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
		$(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \
		$(LOCAL_PATH)/Settings/volumes.pfw

		include $(BUILD_PFW_SETTINGS)

		endif # ifeq (1, 0)

services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/PolicyConfigurableDomains.xml

+80 −0

File changed.

Preview size limit exceeded, changes collapsed.

services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_input_source.pfw

+11 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/mic/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -35,6 +36,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -56,6 +58,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -77,6 +80,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -98,6 +102,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -118,6 +123,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -136,6 +142,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -153,6 +160,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -174,6 +182,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -192,6 +201,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
		communication = 0
		ambient = 0
		@@ -210,6 +220,7 @@ supDomain: DeviceForInputSource
		loopback = 0
		ip = 0
		bus = 0
		stub = 0
		component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
		communication = 0
		ambient = 0

services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_accessibility.pfw

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ supDomain: DeviceForStrategy
		telephony_tx = 0
		ip = 0
		bus = 0
		stub = 0

		domain: Device
		conf: RemoteSubmix

services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_dtmf.pfw

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ supDomain: DeviceForStrategy
		bluetooth_sco_carkit = 0
		ip = 0
		bus = 0
		stub = 0

		domain: Device2
		conf: RemoteSubmix