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

Commit 343cd9e0 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix media.extractor dumpsys crash"

parents c6d179f6 f3b8a779

media/libstagefright/MediaExtractorFactory.cpp

+10 −6
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ status_t MediaExtractorFactory::dump(int fd, const Vector<String16>&) { 
    Mutex::Autolock autoLock(gPluginMutex);

    String8 out;

    out.append("Available extractors:\n");

    if (gPluginsRegistered) {

        for (auto it = gPlugins->begin(); it != gPlugins->end(); ++it) {

            out.appendFormat("  %25s: uuid(%s), version(%u), path(%s)\n",

                    (*it)->def.extractor_name,
@@ -365,6 +366,9 @@ status_t MediaExtractorFactory::dump(int fd, const Vector<String16>&) { 
                    (*it)->def.extractor_version,

                    (*it)->libPath.c_str());

        }

    } else {

        out.append("  (no plugins registered)\n");

    }

    write(fd, out.string(), out.size());

    return OK;

}