audiopolicy: allows to fallback or not on default strategy/group
When attributes does not match a group or strategy, it falls back on
respectively default group or strategy.
This CL allows to control whether fallback shall be done or not.
It allows for example to detect orphans attributes and prevent from
overwritting volume for example.
Bug: 179759299
Test: make
Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Ieeeab48ca3ec2b031b7a99e2e7ab26d2e4d70535
diff --git a/services/audiopolicy/engine/common/include/EngineBase.h b/services/audiopolicy/engine/common/include/EngineBase.h
index 3e42e2d..9bef97c 100644
--- a/services/audiopolicy/engine/common/include/EngineBase.h
+++ b/services/audiopolicy/engine/common/include/EngineBase.h
@@ -53,7 +53,7 @@
audio_policy_dev_state_t /*state*/) override;
product_strategy_t getProductStrategyForAttributes(
- const audio_attributes_t &attr) const override;
+ const audio_attributes_t &attr, bool fallbackOnDefault = true) const override;
audio_stream_type_t getStreamTypeForAttributes(const audio_attributes_t &attr) const override;
@@ -79,9 +79,11 @@
VolumeGroupVector getVolumeGroups() const override;
- volume_group_t getVolumeGroupForAttributes(const audio_attributes_t &attr) const override;
+ volume_group_t getVolumeGroupForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault = true) const override;
- volume_group_t getVolumeGroupForStreamType(audio_stream_type_t stream) const override;
+ volume_group_t getVolumeGroupForStreamType(
+ audio_stream_type_t stream, bool fallbackOnDefault = true) const override;
status_t listAudioVolumeGroups(AudioVolumeGroupVector &groups) const override;
diff --git a/services/audiopolicy/engine/common/include/ProductStrategy.h b/services/audiopolicy/engine/common/include/ProductStrategy.h
index c505456..54625ea 100644
--- a/services/audiopolicy/engine/common/include/ProductStrategy.h
+++ b/services/audiopolicy/engine/common/include/ProductStrategy.h
@@ -129,7 +129,8 @@
* @param attr
* @return applicable product strategy for the given attribute, default if none applicable.
*/
- product_strategy_t getProductStrategyForAttributes(const audio_attributes_t &attr) const;
+ product_strategy_t getProductStrategyForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault = true) const;
product_strategy_t getProductStrategyForStream(audio_stream_type_t stream) const;
@@ -153,9 +154,11 @@
std::string getDeviceAddressForProductStrategy(product_strategy_t strategy) const;
- volume_group_t getVolumeGroupForAttributes(const audio_attributes_t &attr) const;
+ volume_group_t getVolumeGroupForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault = true) const;
- volume_group_t getVolumeGroupForStreamType(audio_stream_type_t stream) const;
+ volume_group_t getVolumeGroupForStreamType(
+ audio_stream_type_t stream, bool fallbackOnDefault = true) const;
volume_group_t getDefaultVolumeGroup() const;
diff --git a/services/audiopolicy/engine/common/src/EngineBase.cpp b/services/audiopolicy/engine/common/src/EngineBase.cpp
index 2137dd0..37e4caa 100644
--- a/services/audiopolicy/engine/common/src/EngineBase.cpp
+++ b/services/audiopolicy/engine/common/src/EngineBase.cpp
@@ -74,9 +74,10 @@
return NO_ERROR;
}
-product_strategy_t EngineBase::getProductStrategyForAttributes(const audio_attributes_t &attr) const
+product_strategy_t EngineBase::getProductStrategyForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault) const
{
- return mProductStrategies.getProductStrategyForAttributes(attr);
+ return mProductStrategies.getProductStrategyForAttributes(attr, fallbackOnDefault);
}
audio_stream_type_t EngineBase::getStreamTypeForAttributes(const audio_attributes_t &attr) const
@@ -320,14 +321,16 @@
return group;
}
-volume_group_t EngineBase::getVolumeGroupForAttributes(const audio_attributes_t &attr) const
+volume_group_t EngineBase::getVolumeGroupForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault) const
{
- return mProductStrategies.getVolumeGroupForAttributes(attr);
+ return mProductStrategies.getVolumeGroupForAttributes(attr, fallbackOnDefault);
}
-volume_group_t EngineBase::getVolumeGroupForStreamType(audio_stream_type_t stream) const
+volume_group_t EngineBase::getVolumeGroupForStreamType(
+ audio_stream_type_t stream, bool fallbackOnDefault) const
{
- return mProductStrategies.getVolumeGroupForStreamType(stream);
+ return mProductStrategies.getVolumeGroupForStreamType(stream, fallbackOnDefault);
}
status_t EngineBase::listAudioVolumeGroups(AudioVolumeGroupVector &groups) const
diff --git a/services/audiopolicy/engine/common/src/ProductStrategy.cpp b/services/audiopolicy/engine/common/src/ProductStrategy.cpp
index 060568a..d4cea5a 100644
--- a/services/audiopolicy/engine/common/src/ProductStrategy.cpp
+++ b/services/audiopolicy/engine/common/src/ProductStrategy.cpp
@@ -169,7 +169,7 @@
}
product_strategy_t ProductStrategyMap::getProductStrategyForAttributes(
- const audio_attributes_t &attr) const
+ const audio_attributes_t &attr, bool fallbackOnDefault) const
{
for (const auto &iter : *this) {
if (iter.second->matches(attr)) {
@@ -178,7 +178,7 @@
}
ALOGV("%s: No matching product strategy for attributes %s, return default", __FUNCTION__,
toString(attr).c_str());
- return getDefault();
+ return fallbackOnDefault? getDefault() : PRODUCT_STRATEGY_NONE;
}
audio_attributes_t ProductStrategyMap::getAttributesForStreamType(audio_stream_type_t stream) const
@@ -272,7 +272,8 @@
return at(psId)->getDeviceAddress();
}
-volume_group_t ProductStrategyMap::getVolumeGroupForAttributes(const audio_attributes_t &attr) const
+volume_group_t ProductStrategyMap::getVolumeGroupForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault) const
{
for (const auto &iter : *this) {
volume_group_t group = iter.second->getVolumeGroupForAttributes(attr);
@@ -280,10 +281,11 @@
return group;
}
}
- return getDefaultVolumeGroup();
+ return fallbackOnDefault ? getDefaultVolumeGroup() : VOLUME_GROUP_NONE;
}
-volume_group_t ProductStrategyMap::getVolumeGroupForStreamType(audio_stream_type_t stream) const
+volume_group_t ProductStrategyMap::getVolumeGroupForStreamType(
+ audio_stream_type_t stream, bool fallbackOnDefault) const
{
for (const auto &iter : *this) {
volume_group_t group = iter.second->getVolumeGroupForStreamType(stream);
@@ -292,7 +294,7 @@
}
}
ALOGW("%s: no volume group for %s, using default", __func__, toString(stream).c_str());
- return getDefaultVolumeGroup();
+ return fallbackOnDefault ? getDefaultVolumeGroup() : VOLUME_GROUP_NONE;
}
volume_group_t ProductStrategyMap::getDefaultVolumeGroup() const
diff --git a/services/audiopolicy/engine/interface/EngineInterface.h b/services/audiopolicy/engine/interface/EngineInterface.h
index a9b536b..f0a01d3 100644
--- a/services/audiopolicy/engine/interface/EngineInterface.h
+++ b/services/audiopolicy/engine/interface/EngineInterface.h
@@ -110,11 +110,12 @@
* Get the strategy selected for a given audio attributes.
*
* @param[in] audio attributes to get the selected @product_strategy_t followed by.
- *
+ * @param fallbackOnDefault if true, will return the fallback strategy if the attributes
+ * are not explicitly assigned to a given strategy.
* @return @product_strategy_t to be followed.
*/
virtual product_strategy_t getProductStrategyForAttributes(
- const audio_attributes_t &attr) const = 0;
+ const audio_attributes_t &attr, bool fallbackOnDefault = true) const = 0;
/**
* @brief getOutputDevicesForAttributes retrieves the devices to be used for given
@@ -271,19 +272,25 @@
* @brief getVolumeGroupForAttributes gets the appropriate volume group to be used for a given
* Audio Attributes.
* @param attr to be considered
+ * @param fallbackOnDefault if true, will return the fallback volume group if the attributes
+ * are not associated to any volume group.
* @return volume group associated to the given audio attributes, default group if none
* applicable, VOLUME_GROUP_NONE if no default group defined.
*/
- virtual volume_group_t getVolumeGroupForAttributes(const audio_attributes_t &attr) const = 0;
+ virtual volume_group_t getVolumeGroupForAttributes(
+ const audio_attributes_t &attr, bool fallbackOnDefault = true) const = 0;
/**
* @brief getVolumeGroupForStreamType gets the appropriate volume group to be used for a given
* legacy stream type
* @param stream type to be considered
+ * @param fallbackOnDefault if true, will return the fallback volume group if the stream type
+ * is not associated to any volume group.
* @return volume group associated to the given stream type, default group if none applicable,
* VOLUME_GROUP_NONE if no default group defined.
*/
- virtual volume_group_t getVolumeGroupForStreamType(audio_stream_type_t stream) const = 0;
+ virtual volume_group_t getVolumeGroupForStreamType(
+ audio_stream_type_t stream, bool fallbackOnDefault = true) const = 0;
/**
* @brief listAudioVolumeGroups introspection API to get the Audio Volume Groups, aka