Merge "GenericSource: restore mLock state in error cases" am: bccd73e209 am: f7f5ab9924 (a09fa50c) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() {

		if (extractor == NULL) {
		ALOGE("initFromDataSource, cannot create extractor!");
		mLock.lock();
		return UNKNOWN_ERROR;
		}

		@@ -179,6 +180,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
		size_t numtracks = extractor->countTracks();
		if (numtracks == 0) {
		ALOGE("initFromDataSource, source has no track!");
		mLock.lock();
		return UNKNOWN_ERROR;
		}