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

Commit 1a597288 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[AudioPolicy][engineconfigurable] audioattribute should match... 

Merge "[AudioPolicy][engineconfigurable] audioattribute should match audio_stream_assist first" am: 84b71232 am: 649738b5 am: 74e2e7c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1332917

Change-Id: Iffdb543c67b1b7e409e7716d4ba5c6b9f8538e32
parents 4bcb19b8 74e2e7c6

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

+6 −6
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ 
    </ProductStrategy>



    <ProductStrategy name="STRATEGY_MEDIA">

        <AttributesGroup streamType="AUDIO_STREAM_ASSISTANT" volumeGroup="assistant">

            <Attributes>

                <ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>

                <Usage value="AUDIO_USAGE_ASSISTANT"/>

            </Attributes>

        </AttributesGroup>

         <AttributesGroup streamType="AUDIO_STREAM_MUSIC" volumeGroup="music">

            <Attributes> <Usage value="AUDIO_USAGE_MEDIA"/> </Attributes>

            <Attributes> <Usage value="AUDIO_USAGE_GAME"/> </Attributes>
@@ -72,12 +78,6 @@ 
            <Attributes> <Usage value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/> </Attributes>

            <Attributes></Attributes>

        </AttributesGroup>

        <AttributesGroup streamType="AUDIO_STREAM_ASSISTANT" volumeGroup="assistant">

            <Attributes>

                <ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>

                <Usage value="AUDIO_USAGE_ASSISTANT"/>

            </Attributes>

        </AttributesGroup>

        <AttributesGroup streamType="AUDIO_STREAM_SYSTEM" volumeGroup="system">

            <Attributes> <Usage value="AUDIO_USAGE_ASSISTANCE_SONIFICATION"/> </Attributes>

        </AttributesGroup>

services/audiopolicy/enginedefault/config/example/phone/audio_policy_engine_product_strategies.xml

+6 −6
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ 
    </ProductStrategy>



    <ProductStrategy name="STRATEGY_MEDIA">

        <AttributesGroup streamType="AUDIO_STREAM_ASSISTANT" volumeGroup="assistant">

            <Attributes>

                <ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>

                <Usage value="AUDIO_USAGE_ASSISTANT"/>

            </Attributes>

        </AttributesGroup>

         <AttributesGroup streamType="AUDIO_STREAM_MUSIC" volumeGroup="music">

            <Attributes> <Usage value="AUDIO_USAGE_MEDIA"/> </Attributes>

            <Attributes> <Usage value="AUDIO_USAGE_GAME"/> </Attributes>
@@ -72,12 +78,6 @@ 
            <Attributes> <Usage value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/> </Attributes>

            <Attributes></Attributes>

        </AttributesGroup>

        <AttributesGroup streamType="AUDIO_STREAM_ASSISTANT" volumeGroup="assistant">

            <Attributes>

                <ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>

                <Usage value="AUDIO_USAGE_ASSISTANT"/>

            </Attributes>

        </AttributesGroup>

        <AttributesGroup streamType="AUDIO_STREAM_SYSTEM" volumeGroup="system">

            <Attributes> <Usage value="AUDIO_USAGE_ASSISTANCE_SONIFICATION"/> </Attributes>

        </AttributesGroup>