audiopolicy: engine: remove deprecated APIs
Test: make
Change-Id: Idfcb060095da92adb286706d4eaf9b9a78a8c61a
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
diff --git a/services/audiopolicy/common/include/RoutingStrategy.h b/services/audiopolicy/common/include/RoutingStrategy.h
deleted file mode 100644
index bddb340..0000000
--- a/services/audiopolicy/common/include/RoutingStrategy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-namespace android {
-
-enum routing_strategy {
- STRATEGY_NONE = -1,
- STRATEGY_MEDIA,
- STRATEGY_PHONE,
- STRATEGY_SONIFICATION,
- STRATEGY_SONIFICATION_RESPECTFUL,
- STRATEGY_DTMF,
- STRATEGY_ENFORCED_AUDIBLE,
- STRATEGY_TRANSMITTED_THROUGH_SPEAKER,
- STRATEGY_ACCESSIBILITY,
- STRATEGY_REROUTING,
- NUM_STRATEGIES
-};
-
-}; //namespace android
diff --git a/services/audiopolicy/engine/interface/AudioPolicyManagerInterface.h b/services/audiopolicy/engine/interface/AudioPolicyManagerInterface.h
index 18ba2c8..498cc3b 100644
--- a/services/audiopolicy/engine/interface/AudioPolicyManagerInterface.h
+++ b/services/audiopolicy/engine/interface/AudioPolicyManagerInterface.h
@@ -17,7 +17,6 @@
#pragma once
#include <AudioPolicyManagerObserver.h>
-#include <RoutingStrategy.h>
#include <media/AudioProductStrategy.h>
#include <policy.h>
#include <Volume.h>
@@ -56,51 +55,6 @@
virtual void setObserver(AudioPolicyManagerObserver *observer) = 0;
/**
- * Get the input device selected for a given input source.
- *
- * @param[in] inputSource to get the selected input device associated to
- *
- * @return selected input device for the given input source, may be none if error.
- *
- * @deprecated use getInputDeviceForAttributes
- */
- virtual audio_devices_t getDeviceForInputSource(audio_source_t inputSource) const = 0;
-
- /**
- * Get the output device associated to a given strategy.
- *
- * @param[in] stream type for which the selected ouput device is requested.
- *
- * @return selected ouput device for the given strategy, may be none if error.
- *
- * @deprecated use getOutputDeviceForAttributes
- */
- virtual audio_devices_t getDeviceForStrategy(routing_strategy stategy) const = 0;
-
- /**
- * Get the strategy selected for a given stream type.
- *
- * @param[in] stream: for which the selected strategy followed by is requested.
- *
- * @return strategy to be followed.
- *
- * @deprecated use getOrderedStreams() / getLinkedStreams() to apply operation on stream
- * following same former routing_strategy
- */
- virtual routing_strategy getStrategyForStream(audio_stream_type_t stream) = 0;
-
- /**
- * Get the strategy selected for a given usage.
- *
- * @param[in] usage to get the selected strategy followed by.
- *
- * @return strategy to be followed.
- *
- * @deprecated use getProductStrategyForAttributes
- */
- virtual routing_strategy getStrategyForUsage(audio_usage_t usage) = 0;
-
- /**
* Set the Telephony Mode.
*
* @param[in] mode: Android Phone state (normal, ringtone, csv, in communication)
diff --git a/services/audiopolicy/engineconfigurable/Android.mk b/services/audiopolicy/engineconfigurable/Android.mk
index 13d874a..bbd9688 100644
--- a/services/audiopolicy/engineconfigurable/Android.mk
+++ b/services/audiopolicy/engineconfigurable/Android.mk
@@ -11,8 +11,6 @@
src/Engine.cpp \
src/EngineInstance.cpp \
src/Stream.cpp \
- src/Strategy.cpp \
- src/Usage.cpp \
src/InputSource.cpp \
../engine/common/src/ProductStrategy.cpp \
../engine/common/src/EngineBase.cpp
diff --git a/services/audiopolicy/engineconfigurable/interface/AudioPolicyPluginInterface.h b/services/audiopolicy/engineconfigurable/interface/AudioPolicyPluginInterface.h
index 53be275..1fc2264 100644
--- a/services/audiopolicy/engineconfigurable/interface/AudioPolicyPluginInterface.h
+++ b/services/audiopolicy/engineconfigurable/interface/AudioPolicyPluginInterface.h
@@ -17,7 +17,6 @@
#pragma once
#include <policy.h>
-#include <RoutingStrategy.h>
#include <EngineDefinition.h>
#include <Volume.h>
#include <system/audio.h>
@@ -38,19 +37,6 @@
{
public:
/**
- * Add a strategy to the engine
- *
- * @param[in] name of the strategy to add
- * @param[in] identifier: the numerical value associated to this member. It MUST match either
- * system/audio.h or system/audio_policy.h enumration value in order to link the
- * parameter controled by the PFW and the policy manager component.
- *
- * @return NO_ERROR if the strategy has been added successfully, error code otherwise.
- *
- */
- virtual android::status_t addStrategy(const std::string &name, routing_strategy id) = 0;
-
- /**
* Add a streams to the engine.
*
* @param[in] name of the stream to add
@@ -64,19 +50,6 @@
virtual android::status_t addStream(const std::string &name, audio_stream_type_t id) = 0;
/**
- * Add a usage to the engine
- *
- * @param[in] name of the usage to add
- * @param[in] identifier: the numerical value associated to this member. It MUST match either
- * system/audio.h or system/audio_policy.h enumration value in order to link the
- * parameter controled by the PFW and the policy manager component.
- *
- * @return NO_ERROR if the usage has been added successfully, error code otherwise.
- *
- */
- virtual android::status_t addUsage(const std::string &name, audio_usage_t id) = 0;
-
- /**
* Add an input source to the engine
*
* @param[in] name of the input source to add
@@ -90,26 +63,6 @@
virtual android::status_t addInputSource(const std::string &name, audio_source_t id) = 0;
/**
- * Set the device to be used by a strategy.
- *
- * @param[in] strategy: name of the strategy for which the device to use has to be set
- * @param[in] devices; mask of devices to be used for the given strategy.
- *
- * @return true if the devices were set correclty for this strategy, false otherwise.
- */
- virtual bool setDeviceForStrategy(const routing_strategy &strategy, audio_devices_t devices) = 0;
-
- /**
- * Set the strategy to be followed by a stream.
- *
- * @param[in] stream: name of the stream for which the strategy to use has to be set
- * @param[in] strategy to follow for the given stream.
- *
- * @return true if the strategy were set correclty for this stream, false otherwise.
- */
- virtual bool setStrategyForStream(const audio_stream_type_t &stream, routing_strategy strategy) = 0;
-
- /**
* Set the strategy to be followed by a stream.
*
* @param[in] stream: name of the stream for which the strategy to use has to be set
@@ -121,16 +74,6 @@
const audio_stream_type_t &volumeProfile) = 0;
/**
- * Set the strategy to be followed by a usage.
- *
- * @param[in] usage: name of the usage for which the strategy to use has to be set
- * @param[in] strategy to follow for the given usage.
- *
- * @return true if the strategy were set correclty for this usage, false otherwise.
- */
- virtual bool setStrategyForUsage(const audio_usage_t &usage, routing_strategy strategy) = 0;
-
- /**
* Set the input device to be used by an input source.
*
* @param[in] inputSource: name of the input source for which the device to use has to be set
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk
index bf7ebb6..060830b 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk
@@ -112,8 +112,6 @@
PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml
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
@@ -139,17 +137,6 @@
PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.xml
PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml
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
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.mk b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.mk
index b341520..ea4a58f 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.mk
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.mk
@@ -61,19 +61,8 @@
PFW_EDD_FILES := \
$(LOCAL_PATH)/Settings/device_for_product_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 \
- $(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/volumes.pfw
LOCAL_ADDITIONAL_DEPENDENCIES := \
$(PFW_EDD_FILES)
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Structure/PolicySubsystem.xml b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Structure/PolicySubsystem.xml
index 9f999b3..b55ce2c 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Structure/PolicySubsystem.xml
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Structure/PolicySubsystem.xml
@@ -27,22 +27,6 @@
<!--#################### GLOBAL COMPONENTS END ####################-->
- <!--#################### STRATEGY BEGIN ####################-->
-
- <ComponentType Name="Strategies">
- <Component Name="media" Type="StrategyConfig" Mapping="Name:STRATEGY_MEDIA"/>
- <Component Name="phone" Type="StrategyConfig" Mapping="Name:STRATEGY_PHONE"/>
- <Component Name="sonification" Type="StrategyConfig" Mapping="Name:STRATEGY_SONIFICATION"/>
- <Component Name="sonification_respectful" Type="StrategyConfig" Mapping="Name:STRATEGY_SONIFICATION_RESPECTFUL"/>
- <Component Name="dtmf" Type="StrategyConfig" Mapping="Name:STRATEGY_DTMF"/>
- <Component Name="enforced_audible" Type="StrategyConfig" Mapping="Name:STRATEGY_ENFORCED_AUDIBLE"/>
- <Component Name="transmitted_through_speaker" Type="StrategyConfig" Mapping="Name:STRATEGY_TRANSMITTED_THROUGH_SPEAKER"/>
- <Component Name="accessibility" Type="StrategyConfig" Mapping="Name:STRATEGY_ACCESSIBILITY"/>
- <Component Name="rerouting" Type="StrategyConfig" Mapping=",Name:STRATEGY_REROUTING"/>
- </ComponentType>
-
- <!--#################### STRATEGY END ####################-->
-
<!--#################### STREAM BEGIN ####################-->
<ComponentType Name="Streams" Description="associated to audio_stream_type_t definition">
@@ -68,40 +52,6 @@
<!--#################### STREAM END ####################-->
- <!--#################### USAGE BEGIN ####################-->
-
- <ComponentType Name="Usages" Description="associated to audio_usage_t definition">
- <Component Name="unknown" Type="Usage" Mapping="Name:AUDIO_USAGE_UNKNOWN"/>
- <Component Name="media" Type="Usage" Mapping="Name:AUDIO_USAGE_MEDIA"/>
- <Component Name="voice_communication" Type="Usage"
- Mapping="Name:AUDIO_USAGE_VOICE_COMMUNICATION"/>
- <Component Name="voice_communication_signalling" Type="Usage"
- Mapping="Name:AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING"/>
- <Component Name="alarm" Type="Usage" Mapping="Name:AUDIO_USAGE_ALARM"/>
- <Component Name="notification" Type="Usage" Mapping="Name:AUDIO_USAGE_NOTIFICATION"/>
- <Component Name="notification_telephony_ringtone" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE"/>
- <Component Name="notification_communication_request" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST"/>
- <Component Name="notification_communication_instant" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT"/>
- <Component Name="notification_communication_delayed" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED"/>
- <Component Name="notification_event" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_EVENT"/>
- <Component Name="assistance_accessibility" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY"/>
- <Component Name="assistance_navigation_guidance" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>
- <Component Name="assistance_sonification" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_SONIFICATION"/>
- <Component Name="game" Type="Usage" Mapping="Name:AUDIO_USAGE_GAME"/>
- <Component Name="virtual_source" Type="Usage" Mapping="Name:AUDIO_USAGE_VIRTUAL_SOURCE"/>
- <Component Name="assistant" Type="Usage" Mapping="Name:AUDIO_USAGE_ASSISTANT"/>
- </ComponentType>
-
- <!--#################### USAGE END ####################-->
-
<!--#################### INPUT SOURCE BEGIN ####################-->
<ComponentType Name="InputSources" Description="associated to audio_source_t definition,
@@ -132,10 +82,7 @@
<InstanceDefinition>
<Component Name="streams" Type="Streams"/>
- <Component Name="strategies" Type="Strategies"/>
<Component Name="input_sources" Type="InputSources"/>
- <Component Name="usages" Type="Usages"/>
-
<Component Name="product_strategies" Type="ProductStrategies"/>
</InstanceDefinition>
</Subsystem>
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.mk b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.mk
index 29296e7..e9d67e9 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.mk
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.mk
@@ -59,19 +59,8 @@
LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
PFW_EDD_FILES := \
- $(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 \
- $(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/device_for_product_strategy_media.pfw \
$(LOCAL_PATH)/Settings/device_for_product_strategy_accessibility.pfw \
$(LOCAL_PATH)/Settings/device_for_product_strategy_dtmf.pfw \
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Structure/PolicySubsystem.xml b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Structure/PolicySubsystem.xml
index 9f999b3..b55ce2c 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Structure/PolicySubsystem.xml
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Structure/PolicySubsystem.xml
@@ -27,22 +27,6 @@
<!--#################### GLOBAL COMPONENTS END ####################-->
- <!--#################### STRATEGY BEGIN ####################-->
-
- <ComponentType Name="Strategies">
- <Component Name="media" Type="StrategyConfig" Mapping="Name:STRATEGY_MEDIA"/>
- <Component Name="phone" Type="StrategyConfig" Mapping="Name:STRATEGY_PHONE"/>
- <Component Name="sonification" Type="StrategyConfig" Mapping="Name:STRATEGY_SONIFICATION"/>
- <Component Name="sonification_respectful" Type="StrategyConfig" Mapping="Name:STRATEGY_SONIFICATION_RESPECTFUL"/>
- <Component Name="dtmf" Type="StrategyConfig" Mapping="Name:STRATEGY_DTMF"/>
- <Component Name="enforced_audible" Type="StrategyConfig" Mapping="Name:STRATEGY_ENFORCED_AUDIBLE"/>
- <Component Name="transmitted_through_speaker" Type="StrategyConfig" Mapping="Name:STRATEGY_TRANSMITTED_THROUGH_SPEAKER"/>
- <Component Name="accessibility" Type="StrategyConfig" Mapping="Name:STRATEGY_ACCESSIBILITY"/>
- <Component Name="rerouting" Type="StrategyConfig" Mapping=",Name:STRATEGY_REROUTING"/>
- </ComponentType>
-
- <!--#################### STRATEGY END ####################-->
-
<!--#################### STREAM BEGIN ####################-->
<ComponentType Name="Streams" Description="associated to audio_stream_type_t definition">
@@ -68,40 +52,6 @@
<!--#################### STREAM END ####################-->
- <!--#################### USAGE BEGIN ####################-->
-
- <ComponentType Name="Usages" Description="associated to audio_usage_t definition">
- <Component Name="unknown" Type="Usage" Mapping="Name:AUDIO_USAGE_UNKNOWN"/>
- <Component Name="media" Type="Usage" Mapping="Name:AUDIO_USAGE_MEDIA"/>
- <Component Name="voice_communication" Type="Usage"
- Mapping="Name:AUDIO_USAGE_VOICE_COMMUNICATION"/>
- <Component Name="voice_communication_signalling" Type="Usage"
- Mapping="Name:AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING"/>
- <Component Name="alarm" Type="Usage" Mapping="Name:AUDIO_USAGE_ALARM"/>
- <Component Name="notification" Type="Usage" Mapping="Name:AUDIO_USAGE_NOTIFICATION"/>
- <Component Name="notification_telephony_ringtone" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE"/>
- <Component Name="notification_communication_request" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST"/>
- <Component Name="notification_communication_instant" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT"/>
- <Component Name="notification_communication_delayed" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED"/>
- <Component Name="notification_event" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_EVENT"/>
- <Component Name="assistance_accessibility" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY"/>
- <Component Name="assistance_navigation_guidance" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>
- <Component Name="assistance_sonification" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_SONIFICATION"/>
- <Component Name="game" Type="Usage" Mapping="Name:AUDIO_USAGE_GAME"/>
- <Component Name="virtual_source" Type="Usage" Mapping="Name:AUDIO_USAGE_VIRTUAL_SOURCE"/>
- <Component Name="assistant" Type="Usage" Mapping="Name:AUDIO_USAGE_ASSISTANT"/>
- </ComponentType>
-
- <!--#################### USAGE END ####################-->
-
<!--#################### INPUT SOURCE BEGIN ####################-->
<ComponentType Name="InputSources" Description="associated to audio_source_t definition,
@@ -132,10 +82,7 @@
<InstanceDefinition>
<Component Name="streams" Type="Streams"/>
- <Component Name="strategies" Type="Strategies"/>
<Component Name="input_sources" Type="InputSources"/>
- <Component Name="usages" Type="Usages"/>
-
<Component Name="product_strategies" Type="ProductStrategies"/>
</InstanceDefinition>
</Subsystem>
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_accessibility.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_accessibility.pfw
deleted file mode 100644
index 7c87c80..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_accessibility.pfw
+++ /dev/null
@@ -1,594 +0,0 @@
-supDomain: DeviceForStrategy
-
- supDomain: Accessibility
- #
- # STRATEGY_ACCESSIBILITY follows STRATEGY_PHONE if in call widely speaking
- # STRATEGY_ACCESSIBILITY follows STRATEGY_MEDIA otherwise
- #
- # Other case are handled programmatically has involving activity of streams.
- #
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- hdmi_arc = 0
- spdif = 0
- aux_line = 0
- fm = 0
- speaker_safe = 0
- telephony_tx = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Device
- conf: RemoteSubmix
- #
- # Accessibility follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes RemoteSubmix
- AvailableOutputDevicesAddresses Includes 0
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 1
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dp
- #
- # Accessibility falls through media strategy if not in call (widely speaking)
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dp
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dpHeadphone
- #
- # Accessibility falls through media strategy if not in call (widely speaking)
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dpSpeaker
- #
- # Accessibility falls through media strategy if not in call (widely speaking)
- #
- ForceUseForMedia IsNot ForceNoBtA2dp
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 1
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: ForceSpeakerWhenNotInCall
- #
- # Accessibility follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia Is ForceSpeaker
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 1
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothScoCarkit
- #
- # accessibility falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes BluetoothScoCarkit
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 1
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothScoHeadset
- #
- # accessibility falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes BluetoothScoHeadset
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 1
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothSco
- #
- # accessibility falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes BluetoothSco
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 1
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: WiredHeadphone
- ANY
- #
- # accessibility falls through Phone strategy if in call
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- #
- # accessibility follows Media strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes WiredHeadphone
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 1
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Line
- ANY
- #
- # accessibility falls through Phone strategy if in call
- # but Line has a lower priority than WiredHeadset in this case.
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- AvailableOutputDevices Excludes WiredHeadset
- #
- # accessibility follows Media strategy if not in call
- #
- AvailableOutputDevices Includes Line
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: WiredHeadset
- ANY
- #
- # accessibility falls through Phone strategy if in call
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- #
- # accessibility follows Media strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes WiredHeadset
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 1
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: UsbDevice
- ANY
- #
- # accessibility falls through Phone strategy if in call (widely speaking)
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- #
- # accessibility follows Media strategy if not in call
- # Media strategy inverts the priority of USB device vs accessory
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Excludes UsbAccessory
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes UsbDevice
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 1
- hdmi = 0
-
- conf: UsbAccessory
- #
- # accessibility falls through Phone strategy if in call (widely speaking)
- # but USB accessory not reachable in call
- #
- # accessibility follows Media strategy if not in call
- # Media strategy inverts the priority of USB device vs accessory
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes UsbAccessory
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 1
- usb_device = 0
- hdmi = 0
-
- conf: DgtlDockHeadset
- #
- # accessibility falls through Phone strategy if in call (widely speaking)
- # but DgtlDockHeadset not reachable in call
- #
- # accessibility follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes DgtlDockHeadset
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 1
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: AuxDigital
- #
- # accessibility falls through Phone strategy if in call (widely speaking)
- # but Hdmi not reachable in call
- #
- # accessibility follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes Hdmi
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 1
-
- conf: AnlgDockHeadset
- #
- # accessibility falls through Phone strategy if in call (widely speaking)
- # but AnlgDockHeadset not reachable in call
- #
- # accessibility follows Media strategy if not in call
- # Media strategy inverts the priority of USB device vs accessory
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes AnlgDockHeadset
- ForceUseForDock Is ForceAnalogDock
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Earpiece
- #
- # accessibility falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes Earpiece
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 1
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Speaker
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 1
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Default
- component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_sco = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_dtmf.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_dtmf.pfw
deleted file mode 100644
index c830c42..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_dtmf.pfw
+++ /dev/null
@@ -1,624 +0,0 @@
-supDomain: DeviceForStrategy
-
- supDomain: Dtmf
-
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- fm = 0
- speaker_safe = 0
- bluetooth_sco_carkit = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Device2
- conf: RemoteSubmix
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes RemoteSubmix
- AvailableOutputDevicesAddresses Includes 0
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 1
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothA2dp
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dp
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothA2dpHeadphones
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothA2dpSpeaker
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 1
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: ForceSpeakerWhenNotInCall
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia Is ForceSpeaker
- ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 1
-
- conf: BluetoothScoHeadset
- #
- # DTMF falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes BluetoothScoHeadset
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothSco
- #
- # DTMF falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes BluetoothSco
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 1
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: WiredHeadphone
- ANY
- #
- # DTMF falls through Phone strategy if in call
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- #
- # DTMF follows Media strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes WiredHeadphone
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 1
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Line
- ANY
- #
- # DTMF falls through Phone strategy if in call
- # but Line has a lower priority than WiredHeadset in this case.
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- AvailableOutputDevices Excludes WiredHeadset
- #
- # DTMF follows Media strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes Line
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 1
- speaker = 0
-
- conf: WiredHeadset
- ANY
- #
- # DTMF falls through Phone strategy if in call
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- #
- # DTMF follows Media strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes WiredHeadset
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 1
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: UsbDevice
- ANY
- #
- # DTMF falls through Phone strategy if in call (widely speaking)
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- #
- # DTMF follows Media strategy if not in call
- # Media strategy inverts the priority of USB device vs accessory
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Excludes UsbAccessory
- ForceUseForCommunication Is ForceSpeaker
- AvailableOutputDevices Includes UsbDevice
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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 = 1
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: UsbAccessory
- #
- # DTMF falls through Phone strategy if in call (widely speaking)
- # but USB accessory not reachable in call
- #
- # DTMF follows Media strategy if not in call
- # Media strategy inverts the priority of USB device vs accessory
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes UsbAccessory
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 1
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: DgtlDockHeadset
- #
- # DTMF falls through Phone strategy if in call (widely speaking)
- # but DgtlDockHeadset not reachable in call
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes DgtlDockHeadset
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 1
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Hdmi
- #
- # DTMF falls through Phone strategy if in call (widely speaking)
- # but Hdmi not reachable in call
- #
- # DTMF follows Media strategy if not in call
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes Hdmi
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: AnlgDockHeadset
- #
- # DTMF falls through Phone strategy if in call (widely speaking)
- # but AnlgDockHeadset not reachable in call
- #
- # DTMF follows Media strategy if not in call
- # Media strategy inverts the priority of USB device vs accessory
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForDock Is ForceAnalogDock
- AvailableOutputDevices Includes AnlgDockHeadset
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Earpiece
- #
- # DTMF falls through Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Includes Earpiece
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 1
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Speaker
- ANY
- #
- # DTMF falls through Phone strategy if in call
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceSpeaker
- #
- # DTMF follows Media strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 1
-
- conf: Default
- component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- domain: Arc
- #
- # DTMF strategy follows media strategy if not in call
- # these following domains consists in device(s) that can co-exist with others
- # e.g. ARC, SPDIF, AUX_LINE
- #
- conf: Selected
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes HdmiArc
-
- /Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 1
-
- conf: NotSelected
- /Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 0
-
- domain: Spdif
- #
- # DTMF strategy follows media strategy if not in call
- # these following domains consists in device(s) that can co-exist with others
- # e.g. ARC, SPDIF, AUX_LINE
- #
- conf: Selected
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes Spdif
-
- /Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 1
-
- conf: NotSelected
- /Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 0
-
- domain: AuxLine
- #
- # DTMF strategy follows media strategy if not in call
- # these following domains consists in device(s) that can co-exist with others
- # e.g. ARC, SPDIF, AUX_LINE
- #
- conf: Selected
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes AuxLine
-
- /Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 1
-
- conf: NotSelected
- /Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 0
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_enforced_audible.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_enforced_audible.pfw
deleted file mode 100644
index c641138..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_enforced_audible.pfw
+++ /dev/null
@@ -1,359 +0,0 @@
-supDomain: DeviceForStrategy
-
- supDomain: EnforcedAudible
-
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- # no enforced_audible on remote submix (e.g. WFD)
- hdmi_arc = 0
- spdif = 0
- aux_line = 0
- speaker_safe = 0
- ip = 0
- bus = 0
- fm = 0
- stub = 0
-
- domain: Speaker
- conf: Selected
- #
- # strategy STRATEGY_ENFORCED_AUDIBLE uses same routing policy as STRATEGY_SONIFICATION
- # except:
- # - when in call where it doesn't default to STRATEGY_PHONE behavior
- # - in countries where not enforced in which case it follows STRATEGY_MEDIA
- #
- AvailableOutputDevices Includes Speaker
- ANY
- ForceUseForSystem Is ForceSystemEnforced
- ALL
- ForceUseForMedia Is ForceSpeaker
- AvailableOutputDevices Excludes RemoteSubmix
- ANY
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Excludes BluetoothA2dp
- AvailableOutputDevices Excludes BluetoothA2dpHeadphones
- AvailableOutputDevices Excludes BluetoothA2dpSpeaker
- #
- # Speaker is also the fallback device if any of the device from Device2 domain
- # is selected.
- #
- ALL
- AvailableOutputDevices Excludes RemoteSubmix
- AvailableOutputDevices Excludes WiredHeadphone
- AvailableOutputDevices Excludes Line
- AvailableOutputDevices Excludes WiredHeadset
- AvailableOutputDevices Excludes UsbAccessory
- AvailableOutputDevices Excludes UsbDevice
- AvailableOutputDevices Excludes DgtlDockHeadset
- AvailableOutputDevices Excludes Hdmi
- ANY
- AvailableOutputDevices Excludes AnlgDockHeadset
- ForceUseForDock IsNot ForceAnalogDock
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- speaker = 1
-
- conf: NotSelected
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- speaker = 0
-
- domain: Device2
- conf: RemoteSubmix
- AvailableOutputDevices Includes RemoteSubmix
- AvailableOutputDevicesAddresses Includes 0
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 1
- earpiece = 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
- telephony_tx = 0
- line = 0
-
- conf: BluetoothA2dp
- AvailableOutputDevices Includes BluetoothA2dp
- ForceUseForMedia IsNot ForceNoBtA2dp
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: BluetoothA2dpHeadphones
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
- ForceUseForMedia IsNot ForceNoBtA2dp
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: BluetoothA2dpSpeaker
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
- ForceUseForMedia IsNot ForceNoBtA2dp
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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 = 1
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: WiredHeadphone
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes WiredHeadphone
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 0
- wired_headphone = 1
- 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
- telephony_tx = 0
- line = 0
-
- conf: Line
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes Line
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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
- telephony_tx = 0
- line = 1
-
- conf: WiredHeadset
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes WiredHeadset
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 0
- wired_headset = 1
- 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
- telephony_tx = 0
- line = 0
-
- conf: UsbAccessory
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes UsbAccessory
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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 = 1
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: UsbDevice
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes UsbDevice
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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 = 1
- telephony_tx = 0
- line = 0
-
- conf: DgtlDockHeadset
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes DgtlDockHeadset
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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 = 1
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: Hdmi
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes Hdmi
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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 = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: AnlgDockHeadset
- ForceUseForMedia IsNot ForceSpeaker
- ForceUseForDock Is ForceAnalogDock
- AvailableOutputDevices Includes AnlgDockHeadset
-
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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 = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: NoDevice
- component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
- remote_submix = 0
- earpiece = 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
- telephony_tx = 0
- line = 0
-
-
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_media.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_media.pfw
deleted file mode 100644
index f8bab3d..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_media.pfw
+++ /dev/null
@@ -1,339 +0,0 @@
-domainGroup: DeviceForStrategy
-
- domainGroup: Media
-
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- fm = 0
- speaker_safe = 0
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- telephony_tx = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Device2
- conf: RemoteSubmix
- AvailableOutputDevices Includes RemoteSubmix
- AvailableOutputDevicesAddresses Includes 0
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 1
- line = 0
-
- conf: BluetoothA2dp
- ForceUseForMedia IsNot ForceNoBtA2dp
- ForceUseForCommunication IsNot ForceBtSco
- AvailableOutputDevices Includes BluetoothA2dp
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 1
- remote_submix = 0
- line = 0
-
- conf: BluetoothA2dpHeadphone
- ForceUseForMedia IsNot ForceNoBtA2dp
- ForceUseForCommunication IsNot ForceBtSco
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: BluetoothA2dpSpeaker
- ForceUseForMedia IsNot ForceNoBtA2dp
- ForceUseForCommunication IsNot ForceBtSco
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: ForceSpeaker
- ForceUseForMedia Is ForceSpeaker
- AvailableOutputDevices Includes Speaker
- #
- # If hdmi system audio mode is on, remove speaker out of output list.
- #
- ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 1
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: WiredHeadphone
- AvailableOutputDevices Includes WiredHeadphone
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 1
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: Line
- AvailableOutputDevices Includes Line
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 1
-
- conf: WiredHeadset
- AvailableOutputDevices Includes WiredHeadset
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 1
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: UsbAccessory
- AvailableOutputDevices Includes UsbAccessory
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 1
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: UsbDevice
- AvailableOutputDevices Includes UsbDevice
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 1
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: DgtlDockHeadset
- AvailableOutputDevices Includes DgtlDockHeadset
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 1
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: AuxDigital
- AvailableOutputDevices Includes Hdmi
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 1
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: AnlgDockHeadset
- AvailableOutputDevices Includes AnlgDockHeadset
- ForceUseForDock Is ForceAnalogDock
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 1
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: Speaker
- AvailableOutputDevices Includes Speaker
- #
- # If hdmi system audio mode is on, remove speaker out of output list.
- #
- ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
- ForceUseForCommunication IsNot ForceBtSco
-
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 1
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- conf: Default
- component: /Policy/policy/strategies/media/selected_output_devices/mask
- speaker = 0
- hdmi = 0
- dgtl_dock_headset = 0
- angl_dock_headset = 0
- usb_device = 0
- usb_accessory = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp = 0
- remote_submix = 0
- line = 0
-
- domain: Arc
- #
- # these following domains consists in device(s) that can co-exist with others
- # e.g. ARC, SPDIF, AUX_LINE
- #
- conf: Selected
- AvailableOutputDevices Includes HdmiArc
-
- /Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 1
-
- conf: NotSelected
- /Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 0
-
- domain: Spdif
- #
- # these following domains consists in device(s) that can co-exist with others
- # e.g. ARC, SPDIF, AUX_LINE
- #
- conf: Selected
- AvailableOutputDevices Includes Spdif
-
- /Policy/policy/strategies/media/selected_output_devices/mask/spdif = 1
-
- conf: NotSelected
- /Policy/policy/strategies/media/selected_output_devices/mask/spdif = 0
-
- domain: AuxLine
- conf: Selected
- AvailableOutputDevices Includes AuxLine
-
- /Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 1
-
- conf: NotSelected
- /Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 0
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_phone.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_phone.pfw
deleted file mode 100644
index d371ad9..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_phone.pfw
+++ /dev/null
@@ -1,483 +0,0 @@
-supDomain: DeviceForStrategy
-
- supDomain: Phone
-
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- # no sonification on remote submix (e.g. WFD)
- remote_submix = 0
- hdmi_arc = 0
- aux_line = 0
- spdif = 0
- fm = 0
- speaker_safe = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Device
- conf: ScoCarkit
- AvailableOutputDevices Includes BluetoothScoCarkit
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothScoHeadset
- AvailableOutputDevices Includes BluetoothScoHeadset
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothSco
- AvailableOutputDevices Includes BluetoothSco
- ForceUseForCommunication Is ForceBtSco
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothA2dp
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes BluetoothA2dp
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- ForceUseForCommunication Is ForceNone
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothA2dpHeadphones
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- ForceUseForCommunication Is ForceNone
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: BluetoothA2dpSpeaker
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- ForceUseForCommunication Is ForceSpeaker
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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 = 1
- hdmi = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: WiredHeadphone
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes WiredHeadphone
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: WiredHeadset
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes WiredHeadset
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 0
- wired_headset = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Line
- AvailableOutputDevices Includes Line
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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
- telephony_tx = 0
- line = 1
- speaker = 0
-
- conf: UsbDevice
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes UsbDevice
- ANY
- ForceUseForCommunication Is ForceBtSco
- ForceUseForCommunication Is ForceNone
- ALL
- ForceUseForCommunication Is ForceSpeaker
- #
- # In case of Force Speaker, priority between device and accessory are
- # inverted compared to Force None or Bt Sco
- #
- AvailableOutputDevices Excludes UsbAccessory
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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 = 1
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: UsbAccessory
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes UsbAccessory
- TelephonyMode IsNot InCommunication
- TelephonyMode IsNot InCall
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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 = 1
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: DgtlDockHeadset
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes DgtlDockHeadset
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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 = 1
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Hdmi
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes Hdmi
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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 = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: AnlgDockHeadset
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes AnlgDockHeadset
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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 = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Earpiece
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes Earpiece
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 1
- 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
- telephony_tx = 0
- line = 0
- speaker = 0
-
- conf: Speaker
- #
- # Fallback BT Sco devices in case of FORCE_BT_SCO
- # or FORCE_NONE
- #
- AvailableOutputDevices Includes Speaker
- ForceUseForCommunication Is ForceSpeaker
-
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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
- telephony_tx = 0
- line = 0
- speaker = 1
-
- conf: Default
- #
- # Fallback on default output device which can be speaker for example
- #
- component: /Policy/policy/strategies/phone/selected_output_devices/mask
- earpiece = 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
- telephony_tx = 0
- line = 0
- speaker = 1
-
-
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_rerouting.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_rerouting.pfw
deleted file mode 100644
index 28a3629..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_rerouting.pfw
+++ /dev/null
@@ -1,301 +0,0 @@
-domainGroup: DeviceForStrategy
-
- domainGroup: Rerouting
- #
- # Falls through media strategy
- #
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- hdmi_arc = 0
- spdif = 0
- aux_line = 0
- fm = 0
- speaker_safe = 0
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- telephony_tx = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Device2
- conf: RemoteSubmix
- AvailableOutputDevices Includes RemoteSubmix
- AvailableOutputDevicesAddresses Includes 0
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 1
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dp
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dp
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dpHeadphone
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dpSpeaker
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 1
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: ForceSpeaker
- ForceUseForMedia Is ForceSpeaker
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 1
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: WiredHeadphone
- AvailableOutputDevices Includes WiredHeadphone
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 1
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Line
- AvailableOutputDevices Includes Line
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: WiredHeadset
- AvailableOutputDevices Includes WiredHeadset
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 1
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: UsbAccessory
- AvailableOutputDevices Includes UsbAccessory
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 1
- usb_device = 0
- hdmi = 0
-
- conf: UsbDevice
- AvailableOutputDevices Includes UsbDevice
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 1
- hdmi = 0
-
- conf: DgtlDockHeadset
- AvailableOutputDevices Includes DgtlDockHeadset
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 1
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: AuxDigital
- #
- # Rerouting is similar to media and sonification (exept here: sonification is not allowed on HDMI)
- #
- AvailableOutputDevices Includes Hdmi
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 1
-
- conf: AnlgDockHeadset
- AvailableOutputDevices Includes AnlgDockHeadset
- ForceUseForDock Is ForceAnalogDock
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Speaker
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 1
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Default
- component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
- remote_submix = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- speaker = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_sonification.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_sonification.pfw
deleted file mode 100644
index 70740d1..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_sonification.pfw
+++ /dev/null
@@ -1,490 +0,0 @@
-supDomain: DeviceForStrategy
-
- supDomain: Sonification
-
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- # no sonification on remote submix (e.g. WFD)
- remote_submix = 0
- hdmi_arc = 0
- spdif = 0
- fm = 0
- speaker_safe = 0
- aux_line = 0
- #
- # Sonification follows phone strategy if in call but HDMI is not reachable
- #
- hdmi = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Speaker
-
- conf: Selected
- AvailableOutputDevices Includes Speaker
- ANY
- #
- # Sonification falls through ENFORCED_AUDIBLE if not in call (widely speaking)
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ALL
- #
- # Sonification follows phone strategy if in call (widely speaking)
- #
- ForceUseForCommunication Is ForceSpeaker
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Excludes Line
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- speaker = 1
-
- conf: NotSelected
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- speaker = 0
-
- domain: Device2
-
- conf: BluetoothA2dp
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- AvailableOutputDevices Includes BluetoothA2dp
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: BluetoothA2dpHeadphones
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: BluetoothA2dpSpeaker
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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 = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: ScoCarkit
- #
- # Sonification follows phone strategy if in call (widely speaking)
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceBtSco
- AvailableOutputDevices Includes BluetoothScoCarkit
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 1
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: ScoHeadset
- #
- # Sonification follows phone strategy if in call (widely speaking)
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceBtSco
- AvailableOutputDevices Includes BluetoothScoHeadset
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 1
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: Sco
- #
- # Sonification follows phone strategy if in call (widely speaking)
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceBtSco
- AvailableOutputDevices Includes BluetoothSco
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 0
- bluetooth_sco = 1
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: WiredHeadphone
- AvailableOutputDevices Includes WiredHeadphone
- ANY
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- #
- # Sonification follows Phone strategy if in call (widely speaking)
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 0
- wired_headphone = 1
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: Line
- AvailableOutputDevices Includes Line
- ANY
- #
- # Sonification follows Phone strategy if in call (widely speaking)
- # but Line has a lower priority than WiredHeadset in this case.
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- AvailableOutputDevices Excludes WiredHeadset
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 1
-
- conf: WiredHeadset
- AvailableOutputDevices Includes WiredHeadset
- ANY
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- ALL
- #
- # Sonification Follows Phone Strategy if in call (widely speaking)
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 0
- wired_headset = 1
- 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
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: UsbDevice
- AvailableOutputDevices Includes UsbDevice
- ANY
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- ALL
- AvailableOutputDevices Excludes UsbAccessory
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- ALL
- #
- # Sonification Follows Phone Strategy if in call (widely speaking)
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 1
- telephony_tx = 0
- line = 0
-
- conf: UsbAccessory
- AvailableOutputDevices Includes UsbAccessory
- #
- # Sonification falls through media strategy if not in call (widely speaking)
- #
- # Sonification Follows Phone Strategy if in call (widely speaking)
- # but USB Accessory not reachable in call.
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 1
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: DgtlDockHeadset
- AvailableOutputDevices Includes DgtlDockHeadset
- #
- # Sonification falls through media strategy if not in call
- #
- # Sonification Follows Phone Strategy if in call (widely speaking)
- # but DgtlDockHeadset not reachable in call.
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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
- angl_dock_headset = 0
- dgtl_dock_headset = 1
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: AnlgDockHeadset
- AvailableOutputDevices Includes AnlgDockHeadset
- #
- # Sonification falls through media strategy if not in call
- #
- # Sonification Follows Phone Strategy if in call (widely speaking)
- # but AnlgDockHeadset not reachable in call.
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- ForceUseForDock Is ForceAnalogDock
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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
- angl_dock_headset = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: Earpiece
- #
- # Sonification Follows Phone Strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- AvailableOutputDevices Includes Earpiece
-
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 1
- 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
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
-
- conf: None
- component: /Policy/policy/strategies/sonification/selected_output_devices/mask
- earpiece = 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
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- telephony_tx = 0
- line = 0
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_sonification_respectful.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_sonification_respectful.pfw
deleted file mode 100644
index b673c4f..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_sonification_respectful.pfw
+++ /dev/null
@@ -1,553 +0,0 @@
-domainGroup: DeviceForStrategy
-
- domainGroup: SonificationRespectful
- #
- # Sonificiation Respectful follows:
- # - If in call: Strategy sonification (that follows phone strategy in call also...)
- # - If not in call AND a music stream is active remotely: Strategy sonification (that
- # follows enforced audible, which follows media)
- # - if not in call and no music stream active remotely and music stream active): strategy
- # media
- # - Otherwise follows sonification by replacing speaker with speaker safe if speaker is
- # selected.
- #
- # Case of stream active handled programmatically
-
- domain: UnreachableDevices
- conf: Calibration
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- remote_submix = 0
- hdmi_arc = 0
- aux_line = 0
- spdif = 0
- fm = 0
- telephony_tx = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Speakers
-
- conf: SpeakerSafe
- AvailableOutputDevices Includes Speaker
- AvailableOutputDevices Includes SpeakerSafe
- #
- # Follows sonification strategy if not in call and replace speaker by speaker safe
- # if and only if speaker only selected
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- speaker_safe = 1
- speaker = 0
-
- conf: Speaker
- AvailableOutputDevices Includes Speaker
- ANY
- #
- # Follows sonification strategy if not in call
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ALL
- #
- # Follows Phone Strategy if call
- #
- ForceUseForCommunication Is ForceSpeaker
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- AvailableOutputDevices Excludes Line
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- speaker_safe = 0
- speaker = 1
-
- conf: None
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- speaker_safe = 0
- speaker = 0
-
- domain: Device2
- conf: BluetoothA2dp
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dp
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 1
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dpHeadphones
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 1
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothA2dpSpeaker
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceNoBtA2dp
- AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 1
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothScoCarkit
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceBtSco
- AvailableOutputDevices Includes BluetoothScoCarkit
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 1
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothScoHeadset
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceBtSco
- AvailableOutputDevices Includes BluetoothScoHeadset
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 1
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: BluetoothSco
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication Is ForceBtSco
- AvailableOutputDevices Includes BluetoothSco
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 1
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: WiredHeadphone
- ANY
- ALL
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- ALL
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes WiredHeadphone
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 1
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Line
- ANY
- #
- # SonificationRespectful Follows Phone strategy if in call
- # but Line has a lower priority than WiredHeadset in this case.
- #
- #
- ALL
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- AvailableOutputDevices Excludes WiredHeadset
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- ALL
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- AvailableOutputDevices Includes WiredHeadphone
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes Line
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 1
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: WiredHeadset
- ANY
- ALL
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- ALL
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes WiredHeadset
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 1
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: UsbDevice
- ANY
- ALL
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- ALL
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Excludes UsbAccessory
- AvailableOutputDevices Includes UsbDevice
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 1
- hdmi = 0
-
- conf: UsbAccessory
- #
- # SonificationRespectful Follows Phone strategy if in call (widely speaking)
- # but UsbAccessory not reachable in call.
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes UsbAccessory
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 1
- usb_device = 0
- hdmi = 0
-
- conf: DgtlDockHeadset
- #
- # SonificationRespectful Follows Phone strategy if in call (widely speaking)
- # but DgtlDockHeadset not reachable in call.
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes DgtlDockHeadset
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 1
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: AuxDigital
- #
- # SonificationRespectful Follows Phone strategy if in call (widely speaking)
- # but HDMI not reachable in call.
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- AvailableOutputDevices Includes Hdmi
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 1
-
- conf: AnlgDockHeadset
- #
- # SonificationRespectful Follows Phone strategy if in call (widely speaking)
- # but AnlgDockHeadset not reachable in call.
- #
- # SonificationRespectful Follows Sonification that falls through Media strategy if not in call
- # SonificationRespectful follows media if music stream is active
- #
- TelephonyMode IsNot InCall
- TelephonyMode IsNot InCommunication
- ForceUseForMedia IsNot ForceSpeaker
- ForceUseForDock Is ForceAnalogDock
- AvailableOutputDevices Includes AnlgDockHeadset
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 1
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: Earpiece
- #
- # SonificationRespectful Follows Phone strategy if in call
- #
- ANY
- TelephonyMode Is InCall
- TelephonyMode Is InCommunication
- ForceUseForCommunication IsNot ForceSpeaker
- AvailableOutputDevices Includes Earpiece
-
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 1
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
-
- conf: None
- component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
- earpiece = 0
- bluetooth_sco = 0
- bluetooth_sco_headset = 0
- bluetooth_sco_carkit = 0
- bluetooth_a2dp_headphones = 0
- bluetooth_a2dp_speaker = 0
- bluetooth_a2dp = 0
- wired_headset = 0
- wired_headphone = 0
- line = 0
- angl_dock_headset = 0
- dgtl_dock_headset = 0
- usb_accessory = 0
- usb_device = 0
- hdmi = 0
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_transmitted_through_speaker.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_transmitted_through_speaker.pfw
deleted file mode 100644
index 9f9c211..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/device_for_strategy_transmitted_through_speaker.pfw
+++ /dev/null
@@ -1,43 +0,0 @@
-supDomain: DeviceForStrategy
-
- supDomain: TransmittedThroughSpeaker
- domain: UnreacheableDevices
- conf: Calibration
- component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
- remote_submix = 0
- hdmi_arc = 0
- spdif = 0
- aux_line = 0
- fm = 0
- speaker_safe = 0
- earpiece = 0
- wired_headset = 1
- 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
- telephony_tx = 0
- line = 0
- ip = 0
- bus = 0
- stub = 0
-
- domain: Speaker
- conf: Selected
- AvailableOutputDevices Includes Speaker
-
- component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
- speaker = 1
-
- conf: NotSelected
- component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
- speaker = 0
-
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/strategy_for_stream.pfw b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/strategy_for_stream.pfw
deleted file mode 100644
index 3940b9d..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/strategy_for_stream.pfw
+++ /dev/null
@@ -1,20 +0,0 @@
-domain: StrategyForStream
-
- conf: Calibration
- /Policy/policy/streams/voice_call/applicable_strategy/strategy = phone
- #
- # NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs
- # while key clicks are played produces a poor result
- #
- /Policy/policy/streams/system/applicable_strategy/strategy = media
- /Policy/policy/streams/ring/applicable_strategy/strategy = sonification
- /Policy/policy/streams/music/applicable_strategy/strategy = media
- /Policy/policy/streams/alarm/applicable_strategy/strategy = sonification
- /Policy/policy/streams/notification/applicable_strategy/strategy = sonification_respectful
- /Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy = phone
- /Policy/policy/streams/enforced_audible/applicable_strategy/strategy = enforced_audible
- /Policy/policy/streams/dtmf/applicable_strategy/strategy = dtmf
- /Policy/policy/streams/tts/applicable_strategy/strategy = transmitted_through_speaker
- /Policy/policy/streams/accessibility/applicable_strategy/strategy = accessibility
- /Policy/policy/streams/rerouting/applicable_strategy/strategy = rerouting
-
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem-CommonTypes.xml b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem-CommonTypes.xml
index 3197387..56c5ed3 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem-CommonTypes.xml
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem-CommonTypes.xml
@@ -133,30 +133,6 @@
</BitParameterBlock>
</ComponentType>
- <!-- Routing Strategy definition as an enumeration. Numerical value must match the value
- of the routing strategy in policy header file. -->
- <ComponentType Name="Strategy">
- <EnumParameter Name="strategy" Size="32">
- <ValuePair Literal="media" Numerical="0"/>
- <ValuePair Literal="phone" Numerical="1"/>
- <ValuePair Literal="sonification" Numerical="2"/>
- <ValuePair Literal="sonification_respectful" Numerical="3"/>
- <ValuePair Literal="dtmf" Numerical="4"/>
- <ValuePair Literal="enforced_audible" Numerical="5"/>
- <ValuePair Literal="transmitted_through_speaker" Numerical="6"/>
- <ValuePair Literal="accessibility" Numerical="7"/>
- <ValuePair Literal="rerouting" Numerical="8"/>
- </EnumParameter>
- </ComponentType>
-
- <!--#################### STRATEGY COMMON TYPES BEGIN ####################-->
-
- <ComponentType Name="StrategyConfig" Mapping="Strategy">
- <Component Name="selected_output_devices" Type="OutputDevicesMask"/>
- </ComponentType>
-
- <!--#################### STRATEGY COMMON TYPES END ####################-->
-
<!--#################### STREAM COMMON TYPES BEGIN ####################-->
<ComponentType Name="VolumeProfileType">
@@ -178,21 +154,12 @@
</ComponentType>
<ComponentType Name="Stream" Mapping="Stream">
- <Component Name="applicable_strategy" Type="Strategy"/>
<Component Name="applicable_volume_profile" Type="VolumeProfileType"
Description="Volume profile followed by a given stream type."/>
</ComponentType>
<!--#################### STREAM COMMON TYPES END ####################-->
- <!--#################### USAGE COMMON TYPES BEGIN ####################-->
-
- <ComponentType Name="Usage">
- <Component Name="applicable_strategy" Type="Strategy" Mapping="Usage"/>
- </ComponentType>
-
- <!--#################### USAGE COMMON TYPES END ####################-->
-
<!--#################### INPUT SOURCE COMMON TYPES BEGIN ####################-->
<ComponentType Name="InputSource">
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem.xml b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem.xml
index 45d1e8a..a4e7537 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem.xml
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicySubsystem.xml
@@ -11,22 +11,6 @@
<!--#################### GLOBAL COMPONENTS END ####################-->
- <!--#################### STRATEGY BEGIN ####################-->
-
- <ComponentType Name="Strategies">
- <Component Name="media" Type="StrategyConfig" Mapping="Name:STRATEGY_MEDIA"/>
- <Component Name="phone" Type="StrategyConfig" Mapping="Name:STRATEGY_PHONE"/>
- <Component Name="sonification" Type="StrategyConfig" Mapping="Name:STRATEGY_SONIFICATION"/>
- <Component Name="sonification_respectful" Type="StrategyConfig" Mapping="Name:STRATEGY_SONIFICATION_RESPECTFUL"/>
- <Component Name="dtmf" Type="StrategyConfig" Mapping="Name:STRATEGY_DTMF"/>
- <Component Name="enforced_audible" Type="StrategyConfig" Mapping="Name:STRATEGY_ENFORCED_AUDIBLE"/>
- <Component Name="transmitted_through_speaker" Type="StrategyConfig" Mapping="Name:STRATEGY_TRANSMITTED_THROUGH_SPEAKER"/>
- <Component Name="accessibility" Type="StrategyConfig" Mapping="Name:STRATEGY_ACCESSIBILITY"/>
- <Component Name="rerouting" Type="StrategyConfig" Mapping=",Name:STRATEGY_REROUTING"/>
- </ComponentType>
-
- <!--#################### STRATEGY END ####################-->
-
<!--#################### STREAM BEGIN ####################-->
<ComponentType Name="Streams" Description="associated to audio_stream_type_t definition">
@@ -52,40 +36,6 @@
<!--#################### STREAM END ####################-->
- <!--#################### USAGE BEGIN ####################-->
-
- <ComponentType Name="Usages" Description="associated to audio_usage_t definition">
- <Component Name="unknown" Type="Usage" Mapping="Name:AUDIO_USAGE_UNKNOWN"/>
- <Component Name="media" Type="Usage" Mapping="Name:AUDIO_USAGE_MEDIA"/>
- <Component Name="voice_communication" Type="Usage"
- Mapping="Name:AUDIO_USAGE_VOICE_COMMUNICATION"/>
- <Component Name="voice_communication_signalling" Type="Usage"
- Mapping="Name:AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING"/>
- <Component Name="alarm" Type="Usage" Mapping="Name:AUDIO_USAGE_ALARM"/>
- <Component Name="notification" Type="Usage" Mapping="Name:AUDIO_USAGE_NOTIFICATION"/>
- <Component Name="notification_telephony_ringtone" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE"/>
- <Component Name="notification_communication_request" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST"/>
- <Component Name="notification_communication_instant" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT"/>
- <Component Name="notification_communication_delayed" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED"/>
- <Component Name="notification_event" Type="Usage"
- Mapping="Name:AUDIO_USAGE_NOTIFICATION_EVENT"/>
- <Component Name="assistance_accessibility" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY"/>
- <Component Name="assistance_navigation_guidance" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>
- <Component Name="assistance_sonification" Type="Usage"
- Mapping="Name:AUDIO_USAGE_ASSISTANCE_SONIFICATION"/>
- <Component Name="game" Type="Usage" Mapping="Name:AUDIO_USAGE_GAME"/>
- <Component Name="virtual_source" Type="Usage" Mapping="Name:AUDIO_USAGE_VIRTUAL_SOURCE"/>
- <Component Name="assistant" Type="Usage" Mapping="Name:AUDIO_USAGE_ASSISTANT"/>
- </ComponentType>
-
- <!--#################### USAGE END ####################-->
-
<!--#################### INPUT SOURCE BEGIN ####################-->
<ComponentType Name="InputSources" Description="associated to audio_source_t definition,
@@ -117,8 +67,6 @@
<InstanceDefinition>
<Component Name="streams" Type="Streams"/>
- <Component Name="strategies" Type="Strategies"/>
<Component Name="input_sources" Type="InputSources"/>
- <Component Name="usages" Type="Usages"/>
</InstanceDefinition>
</Subsystem>
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
index e7a56e1..65dc9af 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
@@ -8,10 +8,8 @@
LOCAL_SRC_FILES := \
PolicySubsystemBuilder.cpp \
PolicySubsystem.cpp \
- Strategy.cpp \
InputSource.cpp \
Stream.cpp \
- Usage.cpp \
ProductStrategy.cpp
LOCAL_CFLAGS += \
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp
index ba6063a..bfc1bca 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.cpp
@@ -17,10 +17,8 @@
#include "PolicySubsystem.h"
#include "SubsystemObjectFactory.h"
#include "PolicyMappingKeys.h"
-#include "Strategy.h"
#include "Stream.h"
#include "InputSource.h"
-#include "Usage.h"
#include "ProductStrategy.h"
#include <AudioPolicyPluginInterface.h>
#include <AudioPolicyEngineInstance.h>
@@ -37,9 +35,7 @@
const char *const PolicySubsystem::mStreamComponentName = "Stream";
-const char *const PolicySubsystem::mStrategyComponentName = "Strategy";
const char *const PolicySubsystem::mInputSourceComponentName = "InputSource";
-const char *const PolicySubsystem::mUsageComponentName = "Usage";
const char *const PolicySubsystem::mProductStrategyComponentName = "ProductStrategy";
PolicySubsystem::PolicySubsystem(const std::string &name, core::log::Logger &logger)
@@ -70,16 +66,6 @@
(1 << MappingKeyName))
);
addSubsystemObjectFactory(
- new TSubsystemObjectFactory<Strategy>(
- mStrategyComponentName,
- 0)
- );
- addSubsystemObjectFactory(
- new TSubsystemObjectFactory<Usage>(
- mUsageComponentName,
- (1 << MappingKeyName))
- );
- addSubsystemObjectFactory(
new TSubsystemObjectFactory<InputSource>(
mInputSourceComponentName,
(1 << MappingKeyName))
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.h b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.h
index 72f3252..9bf1c23 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.h
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/PolicySubsystem.h
@@ -53,8 +53,6 @@
static const char *const mKeyAmend3; /**< amend3 key mapping string. */
static const char *const mStreamComponentName;
- static const char *const mStrategyComponentName;
static const char *const mInputSourceComponentName;
- static const char *const mUsageComponentName;
static const char *const mProductStrategyComponentName;
};
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Strategy.cpp b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Strategy.cpp
deleted file mode 100644
index 876bcb0..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Strategy.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Strategy.h"
-#include "PolicyMappingKeys.h"
-#include "PolicySubsystem.h"
-#include <RoutingStrategy.h>
-
-using std::string;
-using android::routing_strategy;
-
-namespace detail {
-
-constexpr std::pair<routing_strategy, const char*> routingStrategyMap[] = {
- {android::STRATEGY_MEDIA, "STRATEGY_MEDIA"},
- {android::STRATEGY_PHONE, "STRATEGY_PHONE"},
- {android::STRATEGY_SONIFICATION, "STRATEGY_SONIFICATION"},
- {android::STRATEGY_SONIFICATION_RESPECTFUL, "STRATEGY_SONIFICATION_RESPECTFUL"},
- {android::STRATEGY_DTMF, "STRATEGY_DTMF"},
- {android::STRATEGY_ENFORCED_AUDIBLE, "STRATEGY_ENFORCED_AUDIBLE"},
- {android::STRATEGY_TRANSMITTED_THROUGH_SPEAKER, "STRATEGY_TRANSMITTED_THROUGH_SPEAKER"},
- {android::STRATEGY_ACCESSIBILITY, "STRATEGY_ACCESSIBILITY"},
- {android::STRATEGY_REROUTING, "STRATEGY_REROUTING"},
-};
-
-bool fromString(const char *literalName, routing_strategy &type)
-{
- for (auto& pair : routingStrategyMap) {
- if (strcmp(pair.second, literalName) == 0) {
- type = pair.first;
- return true;
- }
- }
- return false;
-}
-
-}
-
-Strategy::Strategy(const string &mappingValue,
- CInstanceConfigurableElement *instanceConfigurableElement,
- const CMappingContext &context,
- core::log::Logger& logger)
- : CFormattedSubsystemObject(instanceConfigurableElement,
- logger,
- mappingValue,
- MappingKeyAmend1,
- (MappingKeyAmendEnd - MappingKeyAmend1 + 1),
- context),
- mPolicySubsystem(static_cast<const PolicySubsystem *>(
- instanceConfigurableElement->getBelongingSubsystem())),
- mPolicyPluginInterface(mPolicySubsystem->getPolicyPluginInterface())
-{
- std::string name(context.getItem(MappingKeyName));
- if (not detail::fromString(name.c_str(), mId)) {
- LOG_ALWAYS_FATAL("Invalid Strategy %s, invalid XML structure file", name.c_str());
- }
- // Declares the strategy to audio policy engine
- mPolicyPluginInterface->addStrategy(instanceConfigurableElement->getName(), mId);
-}
-
-bool Strategy::sendToHW(string & /*error*/)
-{
- uint32_t applicableOutputDevice;
- blackboardRead(&applicableOutputDevice, sizeof(applicableOutputDevice));
- return mPolicyPluginInterface->setDeviceForStrategy(mId, applicableOutputDevice);
-}
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Strategy.h b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Strategy.h
deleted file mode 100644
index c02b82c..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Strategy.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "FormattedSubsystemObject.h"
-#include "InstanceConfigurableElement.h"
-#include "MappingContext.h"
-#include <AudioPolicyPluginInterface.h>
-#include <string>
-
-class PolicySubsystem;
-
-class Strategy : public CFormattedSubsystemObject
-{
-public:
- Strategy(const std::string &mappingValue,
- CInstanceConfigurableElement *instanceConfigurableElement,
- const CMappingContext &context,
- core::log::Logger& logger);
-
-protected:
- virtual bool sendToHW(std::string &error);
-
-private:
- const PolicySubsystem *mPolicySubsystem; /**< Route subsytem plugin. */
-
- /**
- * Interface to communicate with Audio Policy Engine.
- */
- android::AudioPolicyPluginInterface *mPolicyPluginInterface;
-
- android::routing_strategy mId; /**< strategy identifier to link with audio.h.*/
-};
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.cpp b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.cpp
index 46c9e1c..5230e0e 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.cpp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.cpp
@@ -20,7 +20,6 @@
#include <media/TypeConverter.h>
using std::string;
-using android::routing_strategy;
Stream::Stream(const string &/*mappingValue*/,
CInstanceConfigurableElement *instanceConfigurableElement,
@@ -45,11 +44,8 @@
Applicable params;
blackboardRead(¶ms, sizeof(params));
- mPolicyPluginInterface->setStrategyForStream(mId,
- static_cast<routing_strategy>(params.strategy));
-
- mPolicyPluginInterface->setVolumeProfileForStream(mId,
- static_cast<audio_stream_type_t>(params.volumeProfile));
+ mPolicyPluginInterface->setVolumeProfileForStream(
+ mId, static_cast<audio_stream_type_t>(params.volumeProfile));
return true;
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.h b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.h
index 4a875db..e0ce2fa 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.h
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Stream.h
@@ -29,7 +29,6 @@
private:
struct Applicable
{
- uint32_t strategy; /**< applicable strategy for this stream. */
uint32_t volumeProfile; /**< applicable strategy for this stream. */
} __attribute__((packed));
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Usage.cpp b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Usage.cpp
deleted file mode 100644
index 925d631..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Usage.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Usage.h"
-#include "PolicyMappingKeys.h"
-#include "PolicySubsystem.h"
-#include <media/TypeConverter.h>
-
-using std::string;
-using android::routing_strategy;
-
-Usage::Usage(const string &mappingValue,
- CInstanceConfigurableElement *instanceConfigurableElement,
- const CMappingContext &context, core::log::Logger &logger)
- : CFormattedSubsystemObject(instanceConfigurableElement,
- logger,
- mappingValue,
- MappingKeyAmend1,
- (MappingKeyAmendEnd - MappingKeyAmend1 + 1),
- context),
- mPolicySubsystem(static_cast<const PolicySubsystem *>(
- instanceConfigurableElement->getBelongingSubsystem())),
- mPolicyPluginInterface(mPolicySubsystem->getPolicyPluginInterface())
-{
- std::string name(context.getItem(MappingKeyName));
-
- if (not android::UsageTypeConverter::fromString(name, mId)) {
- LOG_ALWAYS_FATAL("Invalid Usage name: %s, invalid XML structure file", name.c_str());
- }
- // Declares the strategy to audio policy engine
- mPolicyPluginInterface->addUsage(name, mId);
-}
-
-bool Usage::sendToHW(string & /*error*/)
-{
- uint32_t applicableStrategy;
- blackboardRead(&applicableStrategy, sizeof(applicableStrategy));
- return mPolicyPluginInterface->setStrategyForUsage(mId,
- static_cast<routing_strategy>(applicableStrategy));
-}
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Usage.h b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Usage.h
deleted file mode 100644
index 860204f..0000000
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Usage.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "FormattedSubsystemObject.h"
-#include "InstanceConfigurableElement.h"
-#include "MappingContext.h"
-#include <AudioPolicyPluginInterface.h>
-#include <string>
-
-class PolicySubsystem;
-
-class Usage : public CFormattedSubsystemObject
-{
-public:
- Usage(const std::string &mappingValue,
- CInstanceConfigurableElement *instanceConfigurableElement,
- const CMappingContext &context,
- core::log::Logger& logger);
-
-protected:
- virtual bool sendToHW(std::string &error);
-
-private:
- const PolicySubsystem *mPolicySubsystem; /**< Route subsytem plugin. */
-
- /**
- * Interface to communicate with Audio Policy Engine.
- */
- android::AudioPolicyPluginInterface *mPolicyPluginInterface;
-
- audio_usage_t mId; /**< usage identifier to link with audio.h. */
-};
diff --git a/services/audiopolicy/engineconfigurable/src/Collection.h b/services/audiopolicy/engineconfigurable/src/Collection.h
index 1f8ed8d..02b41cb 100644
--- a/services/audiopolicy/engineconfigurable/src/Collection.h
+++ b/services/audiopolicy/engineconfigurable/src/Collection.h
@@ -18,8 +18,6 @@
#include "Element.h"
#include "Stream.h"
-#include "Strategy.h"
-#include "Usage.h"
#include "InputSource.h"
#include <utils/Errors.h>
#include <system/audio.h>
@@ -147,15 +145,9 @@
template <>
struct Collection<std::string>::collectionSupported {};
template <>
-struct Collection<audio_usage_t>::collectionSupported {};
-template <>
struct Collection<audio_source_t>::collectionSupported {};
-template <>
-struct Collection<routing_strategy>::collectionSupported {};
-typedef Collection<routing_strategy> StrategyCollection;
typedef Collection<audio_stream_type_t> StreamCollection;
-typedef Collection<audio_usage_t> UsageCollection;
typedef Collection<audio_source_t> InputSourceCollection;
} // namespace audio_policy
diff --git a/services/audiopolicy/engineconfigurable/src/Element.h b/services/audiopolicy/engineconfigurable/src/Element.h
index 1b55c8c..97950d8 100644
--- a/services/audiopolicy/engineconfigurable/src/Element.h
+++ b/services/audiopolicy/engineconfigurable/src/Element.h
@@ -62,7 +62,7 @@
/**
* A Policy element may implement getter/setter function for a given property.
- * Property may be routing_strategy, audio_stream_type_t, audio_usage_t, audio_source_t
+ * Property may be audio_stream_type_t, audio_usage_t, audio_source_t
* or a string.
*
* @tparam Property for which this policy element has setter / getter.
@@ -73,7 +73,7 @@
/**
* A Policy element may implement getter/setter function for a given property.
- * Property may be routing_strategy, audio_stream_type_t, audio_usage_t, audio_source_t
+ * Property may be audio_stream_type_t, audio_usage_t, audio_source_t
* or a string.
*
* @tparam Property for which this policy element has setter / getter.
diff --git a/services/audiopolicy/engineconfigurable/src/Engine.cpp b/services/audiopolicy/engineconfigurable/src/Engine.cpp
index 1b09e3d..f486dca 100644
--- a/services/audiopolicy/engineconfigurable/src/Engine.cpp
+++ b/services/audiopolicy/engineconfigurable/src/Engine.cpp
@@ -25,10 +25,8 @@
#endif
#include "Engine.h"
-#include "Strategy.h"
#include "Stream.h"
#include "InputSource.h"
-#include "Usage.h"
#include <EngineConfig.h>
#include <policy.h>
@@ -42,42 +40,22 @@
namespace audio_policy {
template <>
-StrategyCollection &Engine::getCollection<routing_strategy>()
-{
- return mStrategyCollection;
-}
-template <>
StreamCollection &Engine::getCollection<audio_stream_type_t>()
{
return mStreamCollection;
}
template <>
-UsageCollection &Engine::getCollection<audio_usage_t>()
-{
- return mUsageCollection;
-}
-template <>
InputSourceCollection &Engine::getCollection<audio_source_t>()
{
return mInputSourceCollection;
}
template <>
-const StrategyCollection &Engine::getCollection<routing_strategy>() const
-{
- return mStrategyCollection;
-}
-template <>
const StreamCollection &Engine::getCollection<audio_stream_type_t>() const
{
return mStreamCollection;
}
template <>
-const UsageCollection &Engine::getCollection<audio_usage_t>() const
-{
- return mUsageCollection;
-}
-template <>
const InputSourceCollection &Engine::getCollection<audio_source_t>() const
{
return mInputSourceCollection;
@@ -93,10 +71,8 @@
Engine::~Engine()
{
- mStrategyCollection.clear();
mStreamCollection.clear();
mInputSourceCollection.clear();
- mUsageCollection.clear();
}
status_t Engine::initCheck()
@@ -133,42 +109,6 @@
return element->template get<Property>();
}
-routing_strategy Engine::getStrategyForUsage(audio_usage_t usage)
-{
- return getPropertyForKey<routing_strategy, audio_usage_t>(usage);
-}
-
-audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const
-{
- const SwAudioOutputCollection &outputs = getApmObserver()->getOutputs();
-
- /** This is the only case handled programmatically because the PFW is unable to know the
- * activity of streams.
- *
- * -While media is playing on a remote device, use the the sonification behavior.
- * Note that we test this usecase before testing if media is playing because
- * the isStreamActive() method only informs about the activity of a stream, not
- * if it's for local playback. Note also that we use the same delay between both tests
- *
- * -When media is not playing anymore, fall back on the sonification behavior
- */
- if (strategy == STRATEGY_SONIFICATION_RESPECTFUL &&
- !is_state_in_call(getPhoneState()) &&
- !outputs.isStreamActiveRemotely(AUDIO_STREAM_MUSIC,
- SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY) &&
- outputs.isStreamActive(AUDIO_STREAM_MUSIC, SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY)) {
- return getPropertyForKey<audio_devices_t, routing_strategy>(STRATEGY_MEDIA);
- }
- if (strategy == STRATEGY_ACCESSIBILITY &&
- (outputs.isStreamActive(AUDIO_STREAM_RING) || outputs.isStreamActive(AUDIO_STREAM_ALARM))) {
- // do not route accessibility prompts to a digital output currently configured with a
- // compressed format as they would likely not be mixed and dropped.
- // Device For Sonification conf file has HDMI, SPDIF and HDMI ARC unreacheable.
- return getPropertyForKey<audio_devices_t, routing_strategy>(STRATEGY_SONIFICATION);
- }
- return getPropertyForKey<audio_devices_t, routing_strategy>(strategy);
-}
-
bool Engine::setVolumeProfileForStream(const audio_stream_type_t &stream,
const audio_stream_type_t &profile)
{
diff --git a/services/audiopolicy/engineconfigurable/src/Engine.h b/services/audiopolicy/engineconfigurable/src/Engine.h
index 05fecf0..5553994 100644
--- a/services/audiopolicy/engineconfigurable/src/Engine.h
+++ b/services/audiopolicy/engineconfigurable/src/Engine.h
@@ -43,20 +43,6 @@
///
android::status_t initCheck() override;
- audio_devices_t getDeviceForInputSource(audio_source_t inputSource) const override
- {
- return getPropertyForKey<audio_devices_t, audio_source_t>(inputSource);
- }
-
- audio_devices_t getDeviceForStrategy(routing_strategy stategy) const override;
-
- routing_strategy getStrategyForStream(audio_stream_type_t stream) override
- {
- return getPropertyForKey<routing_strategy, audio_stream_type_t>(stream);
- }
-
- routing_strategy getStrategyForUsage(audio_usage_t usage) override;
-
status_t setPhoneState(audio_mode_t mode) override;
audio_mode_t getPhoneState() const override;
@@ -83,38 +69,17 @@
///
/// from AudioPolicyPluginInterface
///
- status_t addStrategy(const std::string &name, routing_strategy strategy) override
- {
- return add<routing_strategy>(name, strategy);
- }
status_t addStream(const std::string &name, audio_stream_type_t stream) override
{
return add<audio_stream_type_t>(name, stream);
}
- status_t addUsage(const std::string &name, audio_usage_t usage) override
- {
- return add<audio_usage_t>(name, usage);
- }
status_t addInputSource(const std::string &name, audio_source_t source) override
{
return add<audio_source_t>(name, source);
}
- bool setDeviceForStrategy(const routing_strategy &strategy, audio_devices_t devices) override
- {
- return setPropertyForKey<audio_devices_t, routing_strategy>(devices, strategy);
- }
- bool setStrategyForStream(const audio_stream_type_t &stream,
- routing_strategy strategy) override
- {
- return setPropertyForKey<routing_strategy, audio_stream_type_t>(strategy, stream);
- }
bool setVolumeProfileForStream(const audio_stream_type_t &stream,
const audio_stream_type_t &volumeProfile) override;
- bool setStrategyForUsage(const audio_usage_t &usage, routing_strategy strategy) override
- {
- return setPropertyForKey<routing_strategy, audio_usage_t>(strategy, usage);
- }
bool setDeviceForInputSource(const audio_source_t &inputSource, audio_devices_t device) override
{
return setPropertyForKey<audio_devices_t, audio_source_t>(device, inputSource);
@@ -135,9 +100,7 @@
Engine(const Engine &object);
Engine &operator=(const Engine &object);
- StrategyCollection mStrategyCollection; /**< Strategies indexed by their enum id. */
StreamCollection mStreamCollection; /**< Streams indexed by their enum id. */
- UsageCollection mUsageCollection; /**< Usages indexed by their enum id. */
InputSourceCollection mInputSourceCollection; /**< Input sources indexed by their enum id. */
template <typename Key>
diff --git a/services/audiopolicy/engineconfigurable/src/InputSource.h b/services/audiopolicy/engineconfigurable/src/InputSource.h
index 64b390e..e1865cc 100644
--- a/services/audiopolicy/engineconfigurable/src/InputSource.h
+++ b/services/audiopolicy/engineconfigurable/src/InputSource.h
@@ -59,7 +59,7 @@
/**
* A Policy element may implement getter/setter function for a given property.
- * Property may be routing_strategy, audio_stream_type_t, audio_usage_t, audio_source_t
+ * Property may be audio_stream_type_t, audio_usage_t, audio_source_t
* or a string.
*/
template <typename Property>
diff --git a/services/audiopolicy/engineconfigurable/src/Strategy.cpp b/services/audiopolicy/engineconfigurable/src/Strategy.cpp
deleted file mode 100644
index 310b35e..0000000
--- a/services/audiopolicy/engineconfigurable/src/Strategy.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "APM::AudioPolicyEngine/Strategy"
-
-#include "Strategy.h"
-
-using std::string;
-
-namespace android {
-namespace audio_policy {
-
-status_t Element<routing_strategy>::setIdentifier(routing_strategy identifier)
-{
- if (identifier >= NUM_STRATEGIES) {
- return BAD_VALUE;
- }
- mIdentifier = identifier;
- ALOGD("%s: Strategy %s identifier 0x%X", __FUNCTION__, getName().c_str(), identifier);
- return NO_ERROR;
-}
-
-/**
- * Set the device associated to this strategy.
- * It checks if the output device is valid.
- *
- * @param[in] devices selected for the given strategy.
- *
- * @return NO_ERROR if the device is either valid or none, error code otherwise.
- */
-template <>
-status_t Element<routing_strategy>::set<audio_devices_t>(audio_devices_t devices)
-{
- if (!audio_is_output_devices(devices) || devices == AUDIO_DEVICE_NONE) {
- ALOGE("%s: trying to set an invalid device 0x%X for strategy %s",
- __FUNCTION__, devices, getName().c_str());
- return BAD_VALUE;
- }
- ALOGD("%s: 0x%X for strategy %s", __FUNCTION__, devices, getName().c_str());
- mApplicableDevices = devices;
- return NO_ERROR;
-}
-
-template <>
-audio_devices_t Element<routing_strategy>::get<audio_devices_t>() const
-{
- ALOGV("%s: 0x%X for strategy %s", __FUNCTION__, mApplicableDevices, getName().c_str());
- return mApplicableDevices;
-}
-
-} // namespace audio_policy
-} // namespace android
-
diff --git a/services/audiopolicy/engineconfigurable/src/Strategy.h b/services/audiopolicy/engineconfigurable/src/Strategy.h
deleted file mode 100644
index f2487fd..0000000
--- a/services/audiopolicy/engineconfigurable/src/Strategy.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "Element.h"
-#include <RoutingStrategy.h>
-
-namespace android {
-namespace audio_policy {
-
-/**
- * @tparam audio_devices_t: Applicable output device(s) for this strategy.
- */
-template <>
-class Element<routing_strategy>
-{
-public:
- Element(const std::string &name)
- : mName(name),
- mApplicableDevices(AUDIO_DEVICE_NONE)
- {}
- ~Element() {}
-
- /**
- * Returns identifier of this policy element
- *
- * @returns string representing the name of this policy element
- */
- const std::string &getName() const { return mName; }
-
- /**
- * Set the unique identifier for this policy element.
- *
- * @tparam Key type of the unique identifier.
- * @param[in] identifier to be set.
- *
- * @return NO_ERROR if the identifier is valid and set correctly, error code otherwise.
- */
- status_t setIdentifier(routing_strategy identifier);
-
- /**
- * @return the unique identifier of this policy element.
- */
- routing_strategy getIdentifier() const { return mIdentifier; }
-
- /**
- * A Policy element may implement getter/setter function for a given property.
- * Property may be routing_strategy, audio_stream_type_t, audio_usage_t, audio_source_t
- * or a string.
- */
- template <typename Property>
- Property get() const;
-
- template <typename Property>
- status_t set(Property property);
-
-private:
- /* Copy facilities are put private to disable copy. */
- Element(const Element &object);
- Element &operator=(const Element &object);
-
- std::string mName; /**< Unique literal Identifier of a policy base element*/
- routing_strategy mIdentifier; /**< Unique numerical Identifier of a policy base element*/
-
- audio_devices_t mApplicableDevices; /**< Applicable output device(s) for this strategy. */
-};
-
-typedef Element<routing_strategy> Strategy;
-
-} // namespace audio_policy
-} // namespace android
-
-
diff --git a/services/audiopolicy/engineconfigurable/src/Stream.cpp b/services/audiopolicy/engineconfigurable/src/Stream.cpp
index 73fb94d..297eb02 100644
--- a/services/audiopolicy/engineconfigurable/src/Stream.cpp
+++ b/services/audiopolicy/engineconfigurable/src/Stream.cpp
@@ -34,32 +34,6 @@
return NO_ERROR;
}
-/**
-* Set the strategy to follow for this stream.
-* It checks if the strategy is valid.
-*
-* @param[in] strategy to be followed.
-*
-* @return NO_ERROR if the strategy is set correctly, error code otherwise.
-*/
-template <>
-status_t Element<audio_stream_type_t>::set<routing_strategy>(routing_strategy strategy)
-{
- if (strategy >= NUM_STRATEGIES) {
- return BAD_VALUE;
- }
- mApplicableStrategy = strategy;
- ALOGD("%s: 0x%X for Stream %s", __FUNCTION__, strategy, getName().c_str());
- return NO_ERROR;
-}
-
-template <>
-routing_strategy Element<audio_stream_type_t>::get<routing_strategy>() const
-{
- ALOGV("%s: 0x%X for Stream %s", __FUNCTION__, mApplicableStrategy, getName().c_str());
- return mApplicableStrategy;
-}
-
template <>
status_t Element<audio_stream_type_t>::set<audio_stream_type_t>(audio_stream_type_t volumeProfile)
{
diff --git a/services/audiopolicy/engineconfigurable/src/Stream.h b/services/audiopolicy/engineconfigurable/src/Stream.h
index 2bf70b3..a4fdd39 100644
--- a/services/audiopolicy/engineconfigurable/src/Stream.h
+++ b/services/audiopolicy/engineconfigurable/src/Stream.h
@@ -18,22 +18,20 @@
#include "Element.h"
#include "EngineDefinition.h"
-#include <RoutingStrategy.h>
#include <map>
namespace android {
namespace audio_policy {
/**
- * @tparam routing_strategy: Applicable strategy for this stream.
+ * @tparam product_strategy_t: Applicable strategy for this stream.
*/
template <>
class Element<audio_stream_type_t>
{
public:
Element(const std::string &name)
- : mName(name),
- mApplicableStrategy(STRATEGY_MEDIA)
+ : mName(name)
{}
~Element() {}
@@ -61,7 +59,7 @@
/**
* A Policy element may implement getter/setter function for a given property.
- * Property may be routing_strategy, audio_stream_type_t, audio_usage_t, audio_source_t
+ * Property may be audio_stream_type_t, audio_usage_t, audio_source_t
* or a string.
*/
template <typename Property>
@@ -78,8 +76,6 @@
std::string mName; /**< Unique literal Identifier of a policy base element*/
audio_stream_type_t mIdentifier; /**< Unique numerical Identifier of a policy base element*/
- routing_strategy mApplicableStrategy; /**< Applicable strategy for this stream. */
-
audio_stream_type_t mVolumeProfile; /**< Volume Profile followed by this stream. */
};
diff --git a/services/audiopolicy/engineconfigurable/src/Usage.cpp b/services/audiopolicy/engineconfigurable/src/Usage.cpp
deleted file mode 100644
index 8c0dfba..0000000
--- a/services/audiopolicy/engineconfigurable/src/Usage.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "APM::AudioPolicyEngine/Usage"
-
-#include "Usage.h"
-
-namespace android {
-namespace audio_policy {
-
-status_t Element<audio_usage_t>::setIdentifier(audio_usage_t identifier)
-{
- if (identifier > AUDIO_USAGE_MAX) {
- return BAD_VALUE;
- }
- mIdentifier = identifier;
- ALOGD("%s: Usage %s has identifier 0x%X", __FUNCTION__, getName().c_str(), identifier);
- return NO_ERROR;
-}
-
-template <>
-status_t Element<audio_usage_t>::set<routing_strategy>(routing_strategy strategy)
-{
- if (strategy >= NUM_STRATEGIES) {
- return BAD_VALUE;
- }
- ALOGD("%s: %d for Usage %s", __FUNCTION__, strategy, getName().c_str());
- mApplicableStrategy = strategy;
- return NO_ERROR;
-}
-
-template <>
-routing_strategy Element<audio_usage_t>::get<routing_strategy>() const
-{
- ALOGD("%s: %d for Usage %s", __FUNCTION__, mApplicableStrategy, getName().c_str());
- return mApplicableStrategy;
-}
-
-} // namespace audio_policy
-} // namespace android
-
-
diff --git a/services/audiopolicy/engineconfigurable/src/Usage.h b/services/audiopolicy/engineconfigurable/src/Usage.h
deleted file mode 100644
index 72a452f..0000000
--- a/services/audiopolicy/engineconfigurable/src/Usage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "Element.h"
-#include <RoutingStrategy.h>
-
-namespace android {
-namespace audio_policy {
-
-/**
- * @tparam routing_strategy: Applicable strategy for this usage.
- */
-template <>
-class Element<audio_usage_t>
-{
-public:
- Element(const std::string &name)
- : mName(name),
- mApplicableStrategy(STRATEGY_MEDIA)
- {}
- ~Element() {}
-
- /**
- * Returns identifier of this policy element
- *
- * @returns string representing the name of this policy element
- */
- const std::string &getName() const { return mName; }
-
- /**
- * Set the unique identifier for this policy element.
- *
- * @tparam Key type of the unique identifier.
- * @param[in] identifier to be set.
- *
- * @return NO_ERROR if the identifier is valid and set correctly, error code otherwise.
- */
- status_t setIdentifier(audio_usage_t identifier);
-
- /**
- * @return the unique identifier of this policy element.
- */
- audio_usage_t getIdentifier() const { return mIdentifier; }
-
- /**
- * A Policy element may implement getter/setter function for a given property.
- * Property may be routing_strategy, audio_stream_type_t, audio_usage_t, audio_source_t
- * or a string.
- */
- template <typename Property>
- Property get() const;
-
- template <typename Property>
- status_t set(Property property);
-
-private:
- /* Copy facilities are put private to disable copy. */
- Element(const Element &object);
- Element &operator=(const Element &object);
-
- std::string mName; /**< Unique literal Identifier of a policy base element*/
- audio_usage_t mIdentifier; /**< Unique numerical Identifier of a policy base element*/
- routing_strategy mApplicableStrategy; /**< Applicable strategy for this usage. */
-};
-
-typedef Element<audio_usage_t> Usage;
-
-} // namespace audio_policy
-} // namespace android
-
-
diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index a449df6..93af8a6 100644
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -165,88 +165,6 @@
return EngineBase::setForceUse(usage, config);
}
-routing_strategy Engine::getStrategyForStream(audio_stream_type_t stream)
-{
- // stream to strategy mapping
- switch (stream) {
- case AUDIO_STREAM_VOICE_CALL:
- case AUDIO_STREAM_BLUETOOTH_SCO:
- return android::STRATEGY_PHONE;
- case AUDIO_STREAM_RING:
- case AUDIO_STREAM_ALARM:
- return android::STRATEGY_SONIFICATION;
- case AUDIO_STREAM_NOTIFICATION:
- return android::STRATEGY_SONIFICATION_RESPECTFUL;
- case AUDIO_STREAM_DTMF:
- return android::STRATEGY_DTMF;
- default:
- ALOGE("unknown stream type %d", stream);
- FALLTHROUGH_INTENDED;
- case AUDIO_STREAM_SYSTEM:
- // NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs
- // while key clicks are played produces a poor result
- case AUDIO_STREAM_MUSIC:
- return android::STRATEGY_MEDIA;
- case AUDIO_STREAM_ENFORCED_AUDIBLE:
- return android::STRATEGY_ENFORCED_AUDIBLE;
- case AUDIO_STREAM_TTS:
- return android::STRATEGY_TRANSMITTED_THROUGH_SPEAKER;
- case AUDIO_STREAM_ACCESSIBILITY:
- return android::STRATEGY_ACCESSIBILITY;
- case AUDIO_STREAM_REROUTING:
- return android::STRATEGY_REROUTING;
- }
-}
-
-routing_strategy Engine::getStrategyForUsage(audio_usage_t usage)
-{
- // usage to strategy mapping
- switch (usage) {
- case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY:
- return android::STRATEGY_ACCESSIBILITY;
-
- case AUDIO_USAGE_MEDIA:
- case AUDIO_USAGE_GAME:
- case AUDIO_USAGE_ASSISTANT:
- case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:
- case AUDIO_USAGE_ASSISTANCE_SONIFICATION:
- return android::STRATEGY_MEDIA;
-
- case AUDIO_USAGE_VOICE_COMMUNICATION:
- return android::STRATEGY_PHONE;
-
- case AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING:
- return android::STRATEGY_DTMF;
-
- case AUDIO_USAGE_ALARM:
- case AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE:
- return android::STRATEGY_SONIFICATION;
-
- case AUDIO_USAGE_NOTIFICATION:
- case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST:
- case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT:
- case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED:
- case AUDIO_USAGE_NOTIFICATION_EVENT:
- return android::STRATEGY_SONIFICATION_RESPECTFUL;
-
- case AUDIO_USAGE_UNKNOWN:
- default:
- return android::STRATEGY_MEDIA;
- }
-}
-
-audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const
-{
- DeviceVector availableOutputDevices = getApmObserver()->getAvailableOutputDevices();
- DeviceVector availableInputDevices = getApmObserver()->getAvailableInputDevices();
-
- const SwAudioOutputCollection &outputs = getApmObserver()->getOutputs();
-
- return getDeviceForStrategyInt(static_cast<legacy_strategy>(strategy),
- availableOutputDevices,
- availableInputDevices, outputs, (uint32_t)AUDIO_DEVICE_NONE);
-}
-
audio_devices_t Engine::getDeviceForStrategyInt(legacy_strategy strategy,
DeviceVector availableOutputDevices,
DeviceVector availableInputDevices,
diff --git a/services/audiopolicy/enginedefault/src/Engine.h b/services/audiopolicy/enginedefault/src/Engine.h
index 5672c07..15fc358 100644
--- a/services/audiopolicy/enginedefault/src/Engine.h
+++ b/services/audiopolicy/enginedefault/src/Engine.h
@@ -55,14 +55,6 @@
///
/// from EngineBase, so from AudioPolicyManagerInterface
///
- audio_devices_t getDeviceForInputSource(audio_source_t inputSource) const override;
-
- audio_devices_t getDeviceForStrategy(routing_strategy strategy) const override;
-
- routing_strategy getStrategyForStream(audio_stream_type_t stream) override;
-
- routing_strategy getStrategyForUsage(audio_usage_t usage) override;
-
status_t setPhoneState(audio_mode_t mode) override;
status_t setForceUse(audio_policy_force_use_t usage,
@@ -95,6 +87,8 @@
DeviceVector getDevicesForProductStrategy(product_strategy_t strategy) const;
+ audio_devices_t getDeviceForInputSource(audio_source_t inputSource) const;
+
DeviceStrategyMap mDevicesForStrategies;
std::map<product_strategy_t, legacy_strategy> mLegacyStrategyMap;