Merge "Fix FD comparisons in binder" am: 1a9db5066b am: f18ddef416 am: f09b6060ad am: d844863aca (896ac890) · Commits · e / os / android_frameworks_native-old

libs/binder/IPCThreadState.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@ void IPCThreadState::clearCaller()

		void IPCThreadState::flushCommands()
		{
		if (mProcess->mDriverFD <= 0)
		if (mProcess->mDriverFD < 0)
		return;
		talkWithDriver(false);
		// The flush could have caused post-write refcount decrements to have
		@@ -618,7 +618,7 @@ void IPCThreadState::joinThreadPool(bool isMain)

		int IPCThreadState::setupPolling(int* fd)
		{
		if (mProcess->mDriverFD <= 0) {
		if (mProcess->mDriverFD < 0) {
		return -EBADF;
		}

		@@ -924,7 +924,7 @@ finish:

		status_t IPCThreadState::talkWithDriver(bool doReceive)
		{
		if (mProcess->mDriverFD <= 0) {
		if (mProcess->mDriverFD < 0) {
		return -EBADF;
		}

		@@ -982,7 +982,7 @@ status_t IPCThreadState::talkWithDriver(bool doReceive)
		#else
		err = INVALID_OPERATION;
		#endif
		if (mProcess->mDriverFD <= 0) {
		if (mProcess->mDriverFD < 0) {
		err = -EBADF;
		}
		IF_LOG_COMMANDS() {
		@@ -1301,7 +1301,7 @@ void IPCThreadState::threadDestructor(void *st)
		if (self) {
		self->flushCommands();
		#if defined(__ANDROID__)
		if (self->mProcess->mDriverFD > 0) {
		if (self->mProcess->mDriverFD >= 0) {
		ioctl(self->mProcess->mDriverFD, BINDER_THREAD_EXIT, 0);
		}
		#endif