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

Commit f6e2f15f authored by Lorena Torres-Huerta's avatar Lorena Torres-Huerta Committed by Mikhail Naganov
Browse files

Remove 'name' from EngineConfig::AttributesGroup. 

The 'name' variable is ignored by the engine when loading the audio policy engine config (i.e. the framework does nothing with it). Furthermore, it does not exist in the audio_policy_engine_configuration.xsd.

Test: m
Merged-In: I787b8db2c9091936511934853577c7531fd3cb39
Change-Id: I787b8db2c9091936511934853577c7531fd3cb39
(cherry picked from commit 23bca505)
parent 98a30a9a

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

+15 −15
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ namespace android { 
const engineConfig::ProductStrategies gOrderedStrategies = {

    {"STRATEGY_PHONE",

     {

         {"phone", AUDIO_STREAM_VOICE_CALL, "AUDIO_STREAM_VOICE_CALL",

         {AUDIO_STREAM_VOICE_CALL, "AUDIO_STREAM_VOICE_CALL",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_VOICE_COMMUNICATION, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}},

         },

         {"sco", AUDIO_STREAM_BLUETOOTH_SCO, "AUDIO_STREAM_BLUETOOTH_SCO",

         {AUDIO_STREAM_BLUETOOTH_SCO, "AUDIO_STREAM_BLUETOOTH_SCO",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_UNKNOWN, AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_SCO,

            ""}},

         }
@@ -37,11 +37,11 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_SONIFICATION",

     {

         {"ring", AUDIO_STREAM_RING, "AUDIO_STREAM_RING",

         {AUDIO_STREAM_RING, "AUDIO_STREAM_RING",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE,

            AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""}}

         },

         {"alarm", AUDIO_STREAM_ALARM, "AUDIO_STREAM_ALARM",

         {AUDIO_STREAM_ALARM, "AUDIO_STREAM_ALARM",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_ALARM, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}},

         }
@@ -49,7 +49,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_ENFORCED_AUDIBLE",

     {

         {"", AUDIO_STREAM_ENFORCED_AUDIBLE, "AUDIO_STREAM_ENFORCED_AUDIBLE",

         {AUDIO_STREAM_ENFORCED_AUDIBLE, "AUDIO_STREAM_ENFORCED_AUDIBLE",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_UNKNOWN, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_AUDIBILITY_ENFORCED, ""}}

         }
@@ -57,7 +57,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_ACCESSIBILITY",

     {

         {"", AUDIO_STREAM_ACCESSIBILITY, "AUDIO_STREAM_ACCESSIBILITY",

         {AUDIO_STREAM_ACCESSIBILITY, "AUDIO_STREAM_ACCESSIBILITY",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY,

            AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""}}

         }
@@ -65,7 +65,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_SONIFICATION_RESPECTFUL",

     {

         {"", AUDIO_STREAM_NOTIFICATION, "AUDIO_STREAM_NOTIFICATION",

         {AUDIO_STREAM_NOTIFICATION, "AUDIO_STREAM_NOTIFICATION",

          {

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_NOTIFICATION, AUDIO_SOURCE_DEFAULT,

               AUDIO_FLAG_NONE, ""},
@@ -77,11 +77,11 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_MEDIA",

     {

         {"assistant", AUDIO_STREAM_ASSISTANT, "AUDIO_STREAM_ASSISTANT",

         {AUDIO_STREAM_ASSISTANT, "AUDIO_STREAM_ASSISTANT",

          {{AUDIO_CONTENT_TYPE_SPEECH, AUDIO_USAGE_ASSISTANT,

            AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""}}

         },

         {"music", AUDIO_STREAM_MUSIC, "AUDIO_STREAM_MUSIC",

         {AUDIO_STREAM_MUSIC, "AUDIO_STREAM_MUSIC",

          {

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_MEDIA, AUDIO_SOURCE_DEFAULT,

               AUDIO_FLAG_NONE, ""},
@@ -95,7 +95,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
               AUDIO_FLAG_NONE, ""}

          },

         },

         {"system", AUDIO_STREAM_SYSTEM, "AUDIO_STREAM_SYSTEM",

         {AUDIO_STREAM_SYSTEM, "AUDIO_STREAM_SYSTEM",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_ASSISTANCE_SONIFICATION,

            AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""}}

         }
@@ -103,7 +103,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_DTMF",

     {

         {"", AUDIO_STREAM_DTMF, "AUDIO_STREAM_DTMF",

         {AUDIO_STREAM_DTMF, "AUDIO_STREAM_DTMF",

          {

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING,

               AUDIO_SOURCE_DEFAULT, AUDIO_FLAG_NONE, ""}
@@ -113,7 +113,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_CALL_ASSISTANT",

     {

         {"", AUDIO_STREAM_CALL_ASSISTANT, "AUDIO_STREAM_CALL_ASSISTANT",

         {AUDIO_STREAM_CALL_ASSISTANT, "AUDIO_STREAM_CALL_ASSISTANT",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_CALL_ASSISTANT, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}}

         }
@@ -121,7 +121,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_TRANSMITTED_THROUGH_SPEAKER",

     {

         {"", AUDIO_STREAM_TTS, "AUDIO_STREAM_TTS",

         {AUDIO_STREAM_TTS, "AUDIO_STREAM_TTS",

          {

              {AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_UNKNOWN, AUDIO_SOURCE_DEFAULT,

                AUDIO_FLAG_BEACON, ""},
@@ -140,7 +140,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
const engineConfig::ProductStrategies gOrderedSystemStrategies = {

    {"rerouting",

     {

         {"", AUDIO_STREAM_REROUTING, "AUDIO_STREAM_REROUTING",

         {AUDIO_STREAM_REROUTING, "AUDIO_STREAM_REROUTING",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_VIRTUAL_SOURCE, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}}

         }
@@ -148,7 +148,7 @@ const engineConfig::ProductStrategies gOrderedSystemStrategies = { 
    },

    {"patch",

     {

         {"", AUDIO_STREAM_PATCH, "AUDIO_STREAM_PATCH",

         {AUDIO_STREAM_PATCH, "AUDIO_STREAM_PATCH",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_UNKNOWN, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}}

         }

services/audiopolicy/engine/config/include/EngineConfig.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ using AttributesVector = std::vector<audio_attributes_t>; 
using StreamVector = std::vector<audio_stream_type_t>;



struct AttributesGroup {

    std::string name;

    audio_stream_type_t stream;

    std::string volumeGroup;

    AttributesVector attributesVect;

services/audiopolicy/engine/config/src/EngineConfig.cpp

+1 −8
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ struct AttributesGroupTraits : public BaseSerializerTraits<AttributesGroup, Attr 
    static constexpr const char *collectionTag = "AttributesGroups";



    struct Attributes {

        static constexpr const char *name = "name";

        static constexpr const char *streamType = "streamType";

        static constexpr const char *volumeGroup = "volumeGroup";

    };
@@ -313,12 +312,6 @@ static status_t deserializeAttributesCollection(_xmlDoc *doc, const _xmlNode *cu 
status_t AttributesGroupTraits::deserialize(_xmlDoc *doc, const _xmlNode *child,

                                            Collection &attributesGroup)

{

    std::string name = getXmlAttribute(child, Attributes::name);

    if (name.empty()) {

        ALOGV("AttributesGroupTraits No attribute %s found", Attributes::name);

    }

    ALOGV("%s: %s = %s", __FUNCTION__, Attributes::name, name.c_str());



    std::string volumeGroup = getXmlAttribute(child, Attributes::volumeGroup);

    if (volumeGroup.empty()) {

        ALOGE("%s: No attribute %s found", __FUNCTION__, Attributes::volumeGroup);
@@ -339,7 +332,7 @@ status_t AttributesGroupTraits::deserialize(_xmlDoc *doc, const _xmlNode *child, 
    AttributesVector attributesVect;

    deserializeAttributesCollection(doc, child, attributesVect);



    attributesGroup.push_back({name, streamType, volumeGroup, attributesVect});

    attributesGroup.push_back({streamType, volumeGroup, attributesVect});

    return NO_ERROR;

}