summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2011-11-18 13:10:56 -0800
committer Marco Nelissen <marcone@google.com> 2011-11-18 13:10:56 -0800
commit1cad15207df78babcd5871effa63604f78f597ac (patch)
treebcc6a25ab35c333b4ae5ee65e74caae2e56c07c4
parent33d4dde0580176c23f0773f8e18f99ba1111b023 (diff)
status_t != bool
b/5567433 Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
-rw-r--r--media/libmedia/MediaScannerClient.cpp2
-rw-r--r--media/libstagefright/StagefrightMediaScanner.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/MediaScannerClient.cpp b/media/libmedia/MediaScannerClient.cpp
index 7a7aeb638b25..629b165dd491 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 df363c91ae1c..4345184c7c7d 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;
}
}