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

Commit ae1e04f3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7424319, 7424320, 7423808, 7423309, 7424300, 7424301,... 

Merge cherrypicks of [7424319, 7424320, 7423808, 7423309, 7424300, 7424301, 7423809, 7423810, 7424574, 7423811, 7423812, 7423813, 7424594, 7424595, 7424596, 7424597, 7424598, 7423471, 7423472, 7423473, 7424614, 7424615, 7424616, 7423311, 7423507, 7424575] into qt-release

Change-Id: I17aea3203f1fa405b90c607b57bb80268a118ae8
parents bd957414 13886646

media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ void MediaCodecsXmlParser::Impl::Parser::startElementHandler( 
                nextSection = SECTION_ENCODERS;

            } else if (strEq(name, "Settings")) {

                nextSection = SECTION_SETTINGS;

            } else if (strEq(name, "MediaCodecs")) {

            } else if (strEq(name, "MediaCodecs") || strEq(name, "Included")) {

                return;

            } else {

                break;