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

Commit abd0b54c authored by Francois Gaffie's avatar Francois Gaffie Committed by Eric Laurent
Browse files

audiopolicy: engineconfigurable: fix configurations 



Bug: 124767636
Test: build

Change-Id: I377a1343e8ffbaa0d0ea6eea3229e383a50a8cf6
Signed-off-by: default avatarFrancois Gaffie <francois.gaffie@renault.com>
parent 7d602f00

services/audiopolicy/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -62,10 +62,6 @@ ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1) 
$(error Configurable policy does not support legacy conf file)

endif #ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)



LOCAL_REQUIRED_MODULES := \

    parameter-framework.policy \

    audio_policy_criteria.conf \



LOCAL_C_INCLUDES += frameworks/av/services/audiopolicy/engineconfigurable/include

LOCAL_C_INCLUDES += frameworks/av/include

services/audiopolicy/engineconfigurable/config/example/Android.mk

+10 −15
Original line number Diff line number Diff line
@@ -10,16 +10,15 @@ PROVISION_CRITERION_TYPES := $(TOOLS)/provision_criterion_types_from_android_hea 
ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION), phone_configurable)



include $(CLEAR_VARS)

LOCAL_MODULE := audio_policy_engine_configuration_phone.xml

LOCAL_MODULE_STEM := audio_policy_engine_configuration.xml

LOCAL_MODULE := audio_policy_engine_configuration.xml



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_SRC_FILES := phone/$(LOCAL_MODULE_STEM)

LOCAL_SRC_FILES := phone/$(LOCAL_MODULE)



LOCAL_REQUIRED_MODULES := \

    audio_policy_engine_product_strategies_phone.xml  \

    audio_policy_engine_product_strategies.xml  \

    audio_policy_engine_stream_volumes.xml \

    audio_policy_engine_default_stream_volumes.xml \

    audio_policy_engine_criteria.xml \
@@ -28,12 +27,11 @@ LOCAL_REQUIRED_MODULES := \ 
include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := audio_policy_engine_product_strategies_phone.xml

LOCAL_MODULE_STEM := audio_policy_engine_product_strategies.xml

LOCAL_MODULE := audio_policy_engine_product_strategies.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_SRC_FILES := phone/$(LOCAL_MODULE_STEM)

LOCAL_SRC_FILES := phone/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)
@@ -61,16 +59,14 @@ ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION), automotive_configurable) 
# AUTOMOTIVE CONFIGURATION TOP FILE

##################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := audio_policy_engine_configuration_automotive.xml

LOCAL_MODULE_STEM := audio_policy_engine_configuration.xml



LOCAL_MODULE := audio_policy_engine_configuration.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_SRC_FILES := automotive/$(LOCAL_MODULE_STEM)

LOCAL_SRC_FILES := automotive/$(LOCAL_MODULE)



LOCAL_REQUIRED_MODULES := \

    audio_policy_engine_product_strategies_automotive.xml \

    audio_policy_engine_product_strategies.xml \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    audio_policy_engine_volumes.xml
@@ -82,12 +78,11 @@ include $(BUILD_PREBUILT) 
##################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := audio_policy_engine_product_strategies_automotive.xml

LOCAL_MODULE_STEM := audio_policy_engine_product_strategies.xml

LOCAL_MODULE := audio_policy_engine_product_strategies.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_SRC_FILES := automotive/$(LOCAL_MODULE_STEM)

LOCAL_SRC_FILES := automotive/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

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

+20 −5
Original line number Diff line number Diff line
@@ -53,6 +53,21 @@ include $(BUILD_PREBUILT) 


########## Policy PFW Common Structures #########



include $(CLEAR_VARS)

LOCAL_MODULE := PolicySubsystem.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem-CommonTypes.xml \

    ProductStrategies.xml \

    PolicySubsystem-Volume.xml \

    libpolicy-subsystem \



LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := PolicySubsystem-CommonTypes.xml

LOCAL_MODULE_TAGS := optional
@@ -90,7 +105,7 @@ endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_ 
ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-output_configurable no-input_configurable))



include $(CLEAR_VARS)

LOCAL_MODULE := PolicySubsystem.xml.common

LOCAL_MODULE := PolicySubsystem-no-strategy.xml

LOCAL_MODULE_STEM := PolicySubsystem.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC
@@ -110,7 +125,7 @@ endif # ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO 
ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-output_configurable)



include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.no-output

LOCAL_MODULE := parameter-framework.policy

LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true
@@ -118,7 +133,7 @@ LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy 
LOCAL_REQUIRED_MODULES := \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    PolicySubsystem.xml.common \

    PolicySubsystem-no-strategy.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml
@@ -136,7 +151,7 @@ endif # ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-output_configurable 
ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-input_configurable)



include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.no-input

LOCAL_MODULE := parameter-framework.policy

LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true
@@ -144,7 +159,7 @@ LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy 
LOCAL_REQUIRED_MODULES := \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    PolicySubsystem.xml.common \

    PolicySubsystem-no-strategy.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml

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

+2 −19
Original line number Diff line number Diff line
@@ -23,26 +23,9 @@ BUILD_PFW_SETTINGS := $(TOOLS)/build_audio_pfw_settings.mk 
##################################################################



########## Policy PFW Structures #########



include $(CLEAR_VARS)

LOCAL_MODULE := PolicySubsystem.xml.car

LOCAL_MODULE_STEM := PolicySubsystem.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    ProductStrategies.xml \

    PolicySubsystem-Volume.xml \

    PolicySubsystem-CommonTypes.xml \

    libpolicy-subsystem



LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)



######### Policy PFW Settings #########

include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.car

LOCAL_MODULE := parameter-framework.policy

LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true
@@ -57,7 +40,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \ 
    $(PFW_EDD_FILES)



LOCAL_REQUIRED_MODULES := \

    PolicySubsystem.xml.car \

    PolicySubsystem.xml \

    PolicyClass.xml \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Settings/device_for_product_strategies.pfw

+43 −0
Original line number Diff line number Diff line
@@ -714,4 +714,47 @@ supDomain: DeviceForProductStrategies 
					speaker = 0

					bus = 0



	supDomain: Tts

		domain: UnreachableDevices

			conf: calibration

				component: /Policy/policy/product_strategies/tts/selected_output_devices/mask

					earpiece = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					bluetooth_sco = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0

					remote_submix = 0

					telephony_tx = 0

					line = 0

					hdmi_arc = 0

					spdif = 0

					fm = 0

					aux_line = 0

					speaker_safe = 0

					ip = 0

					proxy = 0

					usb_headset = 0

					stub = 0

				/Policy/policy/product_strategies/tts/device_address = BUS00_MEDIA



		domain: SelectedDevice

			conf: Bus

				AvailableOutputDevices Includes Bus

				AvailableOutputDevicesAddresses Includes BUS00_MEDIA



				component: /Policy/policy/product_strategies/tts/selected_output_devices/mask

					bus = 1



			conf: Default

				component: /Policy/policy/product_strategies/tts/selected_output_devices/mask

					bus = 0