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

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

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

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



Change-Id: I39774c3fb38f265670268f74756578024638e49b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f913af9 cf622335

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) {