From 153cefdf4acab25355f590d7760ebf73ef6096a9 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Fri, 18 Nov 2011 13:10:56 -0800 Subject: [PATCH] status_t != bool b/5567433 Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e --- media/libmedia/MediaScannerClient.cpp | 2 +- media/libstagefright/StagefrightMediaScanner.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media/libmedia/MediaScannerClient.cpp b/media/libmedia/MediaScannerClient.cpp index 7a7aeb638b..629b165dd4 100644 --- a/media/libmedia/MediaScannerClient.cpp +++ b/media/libmedia/MediaScannerClient.cpp @@ -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 } diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index df363c91ae..4345184c7c 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -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; } } -- 2.11.0