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

Commit 6f5cc45c authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am d4b22ab4: status_t != bool 

* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool
parents 6479b955 91e2c7d2

media/libmedia/MediaScannerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ status_t MediaScannerClient::addStringTag(const char* name, const char* value) 
            // save the strings for later so they can be used for native encoding detection

            mNames->push_back(name);

            mValues->push_back(value);

            return true;

            return OK;

        }

        // else fall through

    }

media/libstagefright/StagefrightMediaScanner.cpp

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static MediaScanResult HandleMIDI( 
    char buffer[20];

    sprintf(buffer, "%ld", temp);

    status_t status = client->addStringTag("duration", buffer);

    if (status) {

    if (status != OK) {

        return MEDIA_SCAN_RESULT_ERROR;

    }

    return MEDIA_SCAN_RESULT_OK;
@@ -178,7 +178,7 @@ MediaScanResult StagefrightMediaScanner::processFileInternal( 
        const char *value;

        if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) {

            status = client.addStringTag(kKeyMap[i].tag, value);

            if (status) {

            if (status != OK) {

                return MEDIA_SCAN_RESULT_ERROR;

            }

        }