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

Commit 218ede7e authored by Francois Gaffie's avatar Francois Gaffie Committed by Mikhail Naganov
Browse files

audiopolicy: engine: anticipate usage deprecation 



USAGE_NOTIFICATION_COMMUNICATION_<INSTANT|DELAYED|REQUEST> will
be deprecated in android T. USAGE_NOTIFICATION_EVENT will be
kept and audio hal visible (removing the issue of convertion if
AUDIO_NO_SYSTEM_DECLARATIONS is set.

This CL removes the deprecated usage in hardcoded and XML
configuration of audio policy engine.

Bug: 199193042
Test: m
Signed-off-by: default avatarFrancois Gaffie <francois.gaffie@renault.com>
Change-Id: I6a2d581357d71662800f0059fa501f6752247867
parent 94dcd2d4

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>