Merge "Fix all fd leaks in authoring engine" into gingerbread (581581fe) · Commits · e / os / android_frameworks_base

media/libmedia/IMediaRecorder.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <camera/ICamera.h>
		#include <media/IMediaRecorderClient.h>
		#include <media/IMediaRecorder.h>
		#include <unistd.h>

		namespace android {

		@@ -373,6 +374,7 @@ status_t BnMediaRecorder::onTransact(
		int64_t offset = data.readInt64();
		int64_t length = data.readInt64();
		reply->writeInt32(setOutputFile(fd, offset, length));
		::close(fd);
		return NO_ERROR;
		} break;
		case SET_VIDEO_SIZE: {

+5 −5

Original line number	Diff line number	Diff line
		@@ -55,11 +55,6 @@ StagefrightRecorder::StagefrightRecorder()
		StagefrightRecorder::~StagefrightRecorder() {
		LOGV("Destructor");
		stop();

		if (mOutputFd >= 0) {
		::close(mOutputFd);
		mOutputFd = -1;
		}
		}

		status_t StagefrightRecorder::init() {
		@@ -1084,6 +1079,11 @@ status_t StagefrightRecorder::stop() {
		mFlags = 0;
		}

		if (mOutputFd >= 0) {
		::close(mOutputFd);
		mOutputFd = -1;
		}

		return OK;
		}