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

Commit 7a196eb6 authored by liuxiaoyu7's avatar liuxiaoyu7
Browse files

[AudioPolicy][engineconfigurable] audioattribute should match audio_stream_assist first 



if app play audio using uage AUDIO_USAGE_ASSISTANT,
attribute to stream should return audio_stream_assist first instead of audio_stream_music

audio_stream_assist:
 attrBuilder.setUsage(AudioAttributes.USAGE_ASSISTANT);
 attrBuilder.setContentType(AudioAttributes.CONTENT_TYPE_SPEECH);

audio_stream_music:
attrBuilder.setUsage(AudioAttributes.USAGE_ASSISTANT);

Signed-off-by: default avatarliuxiaoyu7 <liuxiaoyu7@xiaomi.com>
Change-Id: Ied2f0c076c53ecfd374fb58b48f0e5da07e3c7a8
parent ec49ef40

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

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

    </ProductStrategy>





    <ProductStrategy name="STRATEGY_MEDIA">

    <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">

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

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

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

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

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

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

            <Attributes></Attributes>

            <Attributes></Attributes>

        </AttributesGroup>

        </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">

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

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

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

        </AttributesGroup>

        </AttributesGroup>

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

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

    </ProductStrategy>





    <ProductStrategy name="STRATEGY_MEDIA">

    <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">

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

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

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

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

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

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

            <Attributes></Attributes>

            <Attributes></Attributes>

        </AttributesGroup>

        </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">

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

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

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

        </AttributesGroup>

        </AttributesGroup>