diff options
| author | Andreas Huber <andih@google.com> | 2009-12-04 04:28:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 04:28:22 -0800 |
| commit | d1a8532c84f3c57677954d3d9345dd88925bb036 (patch) | |
| tree | 62c88b632c0afca550316b2858b6c6e3243d0a13 | |
| parent | 1d51165f49872f2e7f352c1ed51aa7c4d076338e (diff) | |
| parent | b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4 (diff) | |
| download | frameworks_base-d1a8532c84f3c57677954d3d9345dd88925bb036.zip frameworks_base-d1a8532c84f3c57677954d3d9345dd88925bb036.tar.gz frameworks_base-d1a8532c84f3c57677954d3d9345dd88925bb036.tar.bz2 | |
am b8fb6c0b: am 8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'
* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
| -rw-r--r-- | media/libmedia/StagefrightMediaScanner.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/media/libmedia/StagefrightMediaScanner.cpp b/media/libmedia/StagefrightMediaScanner.cpp index 94b9978..522ab5a 100644 --- a/media/libmedia/StagefrightMediaScanner.cpp +++ b/media/libmedia/StagefrightMediaScanner.cpp @@ -32,13 +32,6 @@ status_t StagefrightMediaScanner::processFile( return OK; } -void StagefrightMediaScanner::setLocale(const char *locale) { - if (mLocale) { - free(mLocale); - } - mLocale = strdup(locale); -} - char *StagefrightMediaScanner::extractAlbumArt(int fd) { return NULL; } |