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

Commit 5cb1927a authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audiopolicy: engine: anticipate usage deprecation" am: 98fc7f6f am:... 

Merge "audiopolicy: engine: anticipate usage deprecation" am: 98fc7f6f am: 09142113 am: 4f0ac606

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

Change-Id: I25f8367cdee0e23751d5b989b066d521d97adf04
parents c334a2e7 4f0ac606

services/audiopolicy/engine/common/src/EngineDefaultConfig.h

+0 −6
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
          {

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION, AUDIO_SOURCE_DEFAULT,

               AUDIO_FLAG_NONE, ""},

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST,

               AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""},

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT,

               AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""},

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED,

               AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""},

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION_EVENT,

               AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""}

          }

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

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ 
    <ProductStrategy name="STRATEGY_SONIFICATION_RESPECTFUL">

        <AttributesGroup streamType="AUDIO_STREAM_NOTIFICATION" volumeGroup="notification">

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

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

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

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

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

        </AttributesGroup>

    </ProductStrategy>

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

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ 
    <ProductStrategy name="STRATEGY_SONIFICATION_RESPECTFUL">

        <AttributesGroup streamType="AUDIO_STREAM_NOTIFICATION" volumeGroup="notification">

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

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

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

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

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

        </AttributesGroup>

    </ProductStrategy>