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

resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

Browse Source 
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
This commit is contained in:
Jean-Baptiste Queru
2010-11-19 16:21:31 -08:00
parent 7b76ed693e e2ec61b23b
commit 716f60ce60
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/libstagefright/StagefrightMediaScanner.cpp
View File

@@ -127,10 +127,11 @@ status_t StagefrightMediaScanner::processFile(
|| !strcasecmp(extension, ".rtttl") || !strcasecmp(extension, ".rtttl")
|| !strcasecmp(extension, ".rtx") || !strcasecmp(extension, ".rtx")
|| !strcasecmp(extension, ".ota")) { || !strcasecmp(extension, ".ota")) {
return HandleMIDI(path, &client); status_t status = HandleMIDI(path, &client);
} if (status != OK) {
return status;
if (mRetriever->setDataSource(path) == OK }
} else if (mRetriever->setDataSource(path) == OK
&& mRetriever->setMode( && mRetriever->setMode(
METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) { METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) {
const char *value; const char *value;