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

Commit 9322ba85 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: engine configurable: upgrade to PFW 3.2.4" into nyc-dev

parents e7d45e3f c1391f91

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

+12 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ LOCAL_PATH := $(call my-dir) 


PFW_CORE := external/parameter-framework

BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk

PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/Schemas

PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas

PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)



##################################################################
@@ -26,7 +26,17 @@ LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml 
LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE).in



AUDIO_PATTERN = @TUNING_ALLOWED@

ifeq ($(TARGET_BUILD_VARIANT),user)

AUDIO_VALUE = false

else

AUDIO_VALUE = true

endif



LOCAL_POST_INSTALL_CMD := $(hide) sed -i -e 's|$(AUDIO_PATTERN)|$(AUDIO_VALUE)|g' $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)



include $(BUILD_PREBUILT)

services/audiopolicy/engineconfigurable/parameter-framework/example/ParameterFrameworkConfigurationPolicy.xml→services/audiopolicy/engineconfigurable/parameter-framework/example/ParameterFrameworkConfigurationPolicy.xml.in

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    xsi:noNamespaceSchemaLocation="Schemas/ParameterFrameworkConfiguration.xsd"

    SystemClassName="Policy" ServerPort="5019" TuningAllowed="true">

    SystemClassName="Policy" ServerPort="5019" TuningAllowed="@TUNING_ALLOWED@">



    <SubsystemPlugins>

        <Location Folder="">

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

+10 −55
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- #### DO NOT EDIT THIS FILE #### -->

<ConfigurableDomains xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Schemas/ConfigurableDomains.xsd" SystemClassName="Policy">

<ConfigurableDomains SystemClassName="Policy">

  <ConfigurableDomain Name="DeviceForStrategy.Media.UnreachableDevices" SequenceAware="false">

    <Configurations>

      <Configuration Name="Calibration">
@@ -5220,16 +5220,16 @@ 
      </Configuration>

    </Configurations>

    <ConfigurableElements>

      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc"/>

      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc"/>

    </ConfigurableElements>

    <Settings>

      <Configuration Name="Selected">

        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">

        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">

          <BitParameter Name="hdmi_arc">1</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="NotSelected">

        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">

        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">

          <BitParameter Name="hdmi_arc">0</BitParameter>

        </ConfigurableElement>

      </Configuration>
@@ -5249,16 +5249,16 @@ 
      </Configuration>

    </Configurations>

    <ConfigurableElements>

      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif"/>

      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif"/>

    </ConfigurableElements>

    <Settings>

      <Configuration Name="Selected">

        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">

        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">

          <BitParameter Name="spdif">1</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="NotSelected">

        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">

        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">

          <BitParameter Name="spdif">0</BitParameter>

        </ConfigurableElement>

      </Configuration>
@@ -5278,16 +5278,16 @@ 
      </Configuration>

    </Configurations>

    <ConfigurableElements>

      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line"/>

      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line"/>

    </ConfigurableElements>

    <Settings>

      <Configuration Name="Selected">

        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">

        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">

          <BitParameter Name="aux_line">1</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="NotSelected">

        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">

        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">

          <BitParameter Name="aux_line">0</BitParameter>

        </ConfigurableElement>

      </Configuration>
@@ -5300,7 +5300,6 @@ 
      </Configuration>

    </Configurations>

    <ConfigurableElements>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix"/>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc"/>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif"/>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line"/>
@@ -5308,9 +5307,6 @@ 
    </ConfigurableElements>

    <Settings>

      <Configuration Name="Calibration">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">

          <BitParameter Name="remote_submix">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc">

          <BitParameter Name="hdmi_arc">0</BitParameter>

        </ConfigurableElement>
@@ -5474,7 +5470,6 @@ 
      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx"/>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line"/>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm"/>

      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe"/>

    </ConfigurableElements>

    <Settings>

      <Configuration Name="RemoteSubmix">
@@ -5532,9 +5527,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="BluetoothA2dp">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5591,9 +5583,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="BluetoothA2dpHeadphones">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5650,9 +5639,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="BluetoothA2dpSpeaker">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5709,9 +5695,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="WiredHeadphone">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5768,9 +5751,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="Line">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5827,9 +5807,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="WiredHeadset">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5886,9 +5863,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="UsbAccessory">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -5945,9 +5919,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="UsbDevice">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -6004,9 +5975,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="DgtlDockHeadset">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -6063,9 +6031,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="Hdmi">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -6122,9 +6087,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

      <Configuration Name="AnlgDockHeadset">

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
@@ -6181,9 +6143,6 @@ 
        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">

          <BitParameter Name="fm">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">

          <BitParameter Name="speaker_safe">0</BitParameter>

        </ConfigurableElement>

      </Configuration>

    </Settings>

  </ConfigurableDomain>
@@ -8225,7 +8184,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif"/>
@@ -8837,9 +8795,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device">

          <BitParameter Name="usb_device">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">

          <BitParameter Name="fm_tuner">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner">

          <BitParameter Name="tv_tuner">0</BitParameter>

        </ConfigurableElement>

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

+0 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ supDomain: DeviceForInputSource 
				dgtl_dock_headset = 0

				usb_accessory = 0

				usb_device = 0

				fm_tuner = 0

				tv_tuner = 0

				line = 0

				spdif = 0

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

+6 −6
Original line number Diff line number Diff line
@@ -599,10 +599,10 @@ supDomain: DeviceForStrategy 
				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes HdmiArc



				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 1

				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 1



			conf: NotSelected

				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 0

				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 0



		domain: Spdif

			#
@@ -615,10 +615,10 @@ supDomain: DeviceForStrategy 
				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes Spdif



				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 1

				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 1



			conf: NotSelected

				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 0

				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 0



		domain: AuxLine

			#
@@ -631,7 +631,7 @@ supDomain: DeviceForStrategy 
				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes AuxLine



				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 1

				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 1



			conf: NotSelected

				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 0
 
				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 0