diff options
| author | Marco Nelissen <marcone@google.com> | 2011-11-18 13:10:56 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-11-18 14:21:34 -0800 |
| commit | d4b22ab4889f9b1885bfc0dc45667c846a171a98 (patch) | |
| tree | 4fa2350acd3bdc0d6cf1bca1740e7cf4c142050b | |
| parent | 366113fa1bea5ef39cf6557f18ff00310eb6e458 (diff) | |
| download | frameworks_base-d4b22ab4889f9b1885bfc0dc45667c846a171a98.zip frameworks_base-d4b22ab4889f9b1885bfc0dc45667c846a171a98.tar.gz frameworks_base-d4b22ab4889f9b1885bfc0dc45667c846a171a98.tar.bz2 | |
status_t != bool
b/5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
| -rw-r--r-- | media/libmedia/MediaScannerClient.cpp | 2 | ||||
| -rw-r--r-- | 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 7a7aeb6..629b165 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 571e8be..f693c72 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; } } |