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

Commit 1731e2be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodecsXmlParser: append variants instead of replacing" into main... 

Merge "MediaCodecsXmlParser: append variants instead of replacing" into main am: cf622335 am: b955cb53

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



Change-Id: I9fc53fba375e340f95c857d809656c8705176e16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd4d7e42 b955cb53

media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ status_t MediaCodecsXmlParser::Impl::Parser::updateMediaCodec( 
        codec.rank = rank;

    }



    codec.variantSet = variants;

    codec.variantSet.insert(variants.begin(), variants.end());



    // we allow sets of domains...

    for (const std::string &domain : domains) {