Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d4b22ab4: status_t != bool

Browse Source 
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool
This commit is contained in:
Marco Nelissen
2011-11-18 15:07:21 -08:00
committed by Android Git Automerger
parent d8a3cabcb1 d4b22ab488
commit 7ff7821a60
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libmedia/MediaScannerClient.cpp
View File

@@ -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 // save the strings for later so they can be used for native encoding detection
mNames->push_back(name); mNames->push_back(name);
mValues->push_back(value); mValues->push_back(value);
return true; return OK;
} }
// else fall through // else fall through
} }

4
media/libstagefright/StagefrightMediaScanner.cpp
View File

@@ -94,7 +94,7 @@ static MediaScanResult HandleMIDI(
char buffer[20]; char buffer[20];
sprintf(buffer, "%ld", temp); sprintf(buffer, "%ld", temp);
status_t status = client->addStringTag("duration", buffer); status_t status = client->addStringTag("duration", buffer);
if (status) { if (status != OK) {
return MEDIA_SCAN_RESULT_ERROR; return MEDIA_SCAN_RESULT_ERROR;
} }
return MEDIA_SCAN_RESULT_OK; return MEDIA_SCAN_RESULT_OK;
@@ -178,7 +178,7 @@ MediaScanResult StagefrightMediaScanner::processFileInternal(
const char *value; const char *value;
if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) { if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) {
status = client.addStringTag(kKeyMap[i].tag, value); status = client.addStringTag(kKeyMap[i].tag, value);
if (status) { if (status != OK) {
return MEDIA_SCAN_RESULT_ERROR; return MEDIA_SCAN_RESULT_ERROR;
} }
} }