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

Commit 3b935c6d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio policy: add parsing for profile max open and active count"

parents f7e309d6 89984a0c

services/audiopolicy/common/managerdefinitions/include/Serializer.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ struct MixPortTraits 
        static const char name[];

        static const char role[];

        static const char flags[];

        static const char maxOpenCount[];

        static const char maxActiveCount[];

    };



    typedef IOProfile Element;

services/audiopolicy/common/managerdefinitions/src/Serializer.cpp

+10 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ const char *const MixPortTraits::tag = "mixPort"; 
const char MixPortTraits::Attributes::name[] = "name";

const char MixPortTraits::Attributes::role[] = "role";

const char MixPortTraits::Attributes::flags[] = "flags";

const char MixPortTraits::Attributes::maxOpenCount[] = "maxOpenCount";

const char MixPortTraits::Attributes::maxActiveCount[] = "maxActiveCount";



status_t MixPortTraits::deserialize(_xmlDoc *doc, const _xmlNode *child, PtrElement &mixPort,

                                    PtrSerializingCtx /*serializingContext*/)
@@ -259,6 +261,14 @@ status_t MixPortTraits::deserialize(_xmlDoc *doc, const _xmlNode *child, PtrElem 
            mixPort->setFlags(InputFlagConverter::maskFromString(flags));

        }

    }

    string maxOpenCount = getXmlAttribute(child, Attributes::maxOpenCount);

    if (!maxOpenCount.empty()) {

        convertTo(maxOpenCount, mixPort->maxOpenCount);

    }

    string maxActiveCount = getXmlAttribute(child, Attributes::maxActiveCount);

    if (!maxActiveCount.empty()) {

        convertTo(maxActiveCount, mixPort->maxActiveCount);

    }

    // Deserialize children

    AudioGainTraits::Collection gains;

    deserializeCollection<AudioGainTraits>(doc, child, gains, NULL);