Skip to content

Commit 7ff7821

Browse files
marconeAndroid Git Automerger
authored andcommitted
am d4b22ab: status_t != bool
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98': status_t != bool
2 parents d8a3cab + d4b22ab commit 7ff7821

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

media/libmedia/MediaScannerClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ status_t MediaScannerClient::addStringTag(const char* name, const char* value)
8282
// save the strings for later so they can be used for native encoding detection
8383
mNames->push_back(name);
8484
mValues->push_back(value);
85-
return true;
85+
return OK;
8686
}
8787
// else fall through
8888
}

media/libstagefright/StagefrightMediaScanner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static MediaScanResult HandleMIDI(
9494
char buffer[20];
9595
sprintf(buffer, "%ld", temp);
9696
status_t status = client->addStringTag("duration", buffer);
97-
if (status) {
97+
if (status != OK) {
9898
return MEDIA_SCAN_RESULT_ERROR;
9999
}
100100
return MEDIA_SCAN_RESULT_OK;
@@ -178,7 +178,7 @@ MediaScanResult StagefrightMediaScanner::processFileInternal(
178178
const char *value;
179179
if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) {
180180
status = client.addStringTag(kKeyMap[i].tag, value);
181-
if (status) {
181+
if (status != OK) {
182182
return MEDIA_SCAN_RESULT_ERROR;
183183
}
184184
}

0 commit comments

Comments
 (0)