drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d670d34: Merge change I1f1c7bad into eclair-mr2

Browse Source 
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
This commit is contained in:
Andreas Huber
2009-12-03 16:44:26 -08:00
committed by Android Git Automerger
parent 20208ff643 8d670d3458
commit b8fb6c0bd8
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libmedia/StagefrightMediaScanner.cpp
View File

@ -32,13 +32,6 @@ status_t StagefrightMediaScanner::processFile(
return OK; return OK;
} }
void StagefrightMediaScanner::setLocale(const char *locale) {
if (mLocale) {
free(mLocale);
}
mLocale = strdup(locale);
}
char *StagefrightMediaScanner::extractAlbumArt(int fd) { char *StagefrightMediaScanner::extractAlbumArt(int fd) {
return NULL; return NULL;
} }