Commit ceb9ce66 authored Dec 04, 2009 by Andreas Huber Committed by Android Git Automerger Dec 04, 2009

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.

parents aaaa915f 9c0674d1

media/libmedia/StagefrightMediaScanner.cpp

+0 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}