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

Commit 621b41c7 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp 

* commit '716f60ce':
  StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
parents be4e1c8f 716f60ce

media/libstagefright/StagefrightMediaScanner.cpp

+5 −4
Original line number Diff line number Diff line
@@ -127,10 +127,11 @@ status_t StagefrightMediaScanner::processFile( 
            || !strcasecmp(extension, ".rtttl")

            || !strcasecmp(extension, ".rtx")

            || !strcasecmp(extension, ".ota")) {

        return HandleMIDI(path, &client);

        status_t status = HandleMIDI(path, &client);

        if (status != OK) {

            return status;

        }



    if (mRetriever->setDataSource(path) == OK

    } else if (mRetriever->setDataSource(path) == OK

            && mRetriever->setMode(

                METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) {

        const char *value;