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

Commit 15811d35 authored Jan 14, 2020 by Francois Gaffie Committed by Mikhail Naganov Jan 28, 2020

[AudioPolicy][EngineConfigurable] Fix new assistant stream regression



New assistant stream has been added.
This CL fixes the support of new stream within configurable engine.

Bug:
Test: build

Change-Id: If33aa6ea668655d933d274d9c46447185f75c8d0
Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>

parent 8b048921

services/audiopolicy/engineconfigurable/config/example/automotive/audio_policy_engine_product_strategies.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ limitations under the License.
		</AttributesGroup>
		</ProductStrategy>
		<ProductStrategy name="voice_command">
		<AttributesGroup volumeGroup="speech">
		<AttributesGroup volumeGroup="speech" streamType="AUDIO_STREAM_ASSISTANT">
		<Attributes>
		<ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>
		<Usage value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>

services/audiopolicy/engineconfigurable/config/example/caremu/audio_policy_engine_product_strategies.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ limitations under the License.
		</AttributesGroup>
		</ProductStrategy>
		<ProductStrategy name="voice_command">
		<AttributesGroup volumeGroup="speech">
		<AttributesGroup volumeGroup="speech" streamType="AUDIO_STREAM_ASSISTANT">
		<Attributes>
		<ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>
		<Usage value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ supDomain: VolumeProfilesForStream
		/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile = enforced_audible
		/Policy/policy/streams/tts/applicable_volume_profile/volume_profile = tts
		/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile = accessibility
		/Policy/policy/streams/assistant/applicable_volume_profile/volume_profile = assistant
		/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile = rerouting
		/Policy/policy/streams/patch/applicable_volume_profile/volume_profile = patch

services/audiopolicy/engineconfigurable/parameter-framework/examples/common/Structure/PolicySubsystem-no-strategy.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		Description="Transmitted Through Speaker. Plays over speaker only, silent on other devices"/>
		<Component Name="accessibility" Type="Stream" Mapping="Name:AUDIO_STREAM_ACCESSIBILITY"
		Description="For accessibility talk back prompts"/>
		<Component Name="assistant" Type="Stream" Mapping="Name:AUDIO_STREAM_ASSISTANT"
		Description="used by a virtual assistant like Google Assistant, Bixby, etc."/>
		<Component Name="rerouting" Type="Stream" Mapping="Name:AUDIO_STREAM_REROUTING"
		Description="For dynamic policy output mixes"/>
		<Component Name="patch" Type="Stream" Mapping="Name:AUDIO_STREAM_PATCH"

services/audiopolicy/engineconfigurable/parameter-framework/examples/common/Structure/PolicySubsystem.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@
		Description="Transmitted Through Speaker. Plays over speaker only, silent on other devices"/>
		<Component Name="accessibility" Type="Stream" Mapping="Name:AUDIO_STREAM_ACCESSIBILITY"
		Description="For accessibility talk back prompts"/>
		<Component Name="assistant" Type="Stream" Mapping="Name:AUDIO_STREAM_ASSISTANT"
		Description="used by a virtual assistant like Google Assistant, Bixby, etc."/>
		<Component Name="rerouting" Type="Stream" Mapping="Name:AUDIO_STREAM_REROUTING"
		Description="For dynamic policy output mixes"/>
		<Component Name="patch" Type="Stream" Mapping="Name:AUDIO_STREAM_PATCH"