Merge cherrypicks of [8011031] into qt-qpr1-release (0f1320b2) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,6 @@ void NuPlayer::GenericSource::onPrepareAsync() {
		if (httpSource == NULL) {
		ALOGE("Failed to create http source!");
		notifyPreparedAndCleanup(UNKNOWN_ERROR);
		mDisconnectLock.lock();
		return;
		}
		mDisconnectLock.lock();
		@@ -449,6 +448,7 @@ void NuPlayer::GenericSource::onPrepareAsync() {

		if (mDataSource == NULL) {
		ALOGE("Failed to create data source!");
		mDisconnectLock.unlock();
		notifyPreparedAndCleanup(UNKNOWN_ERROR);
		return;
		}