Merge "Fix surfaceflinger file descriptor leak" am: af2fbb0ccc (735d3240) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlingerConsumer.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -70,6 +70,14 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter,
		return err;
		}

		if (autoRefresh) {
		*autoRefresh = item.mAutoRefresh;
		}

		if (queuedBuffer) {
		*queuedBuffer = item.mQueuedBuffer;
		}

		// We call the rejecter here, in case the caller has a reason to
		// not accept this buffer. This is used by SurfaceFlinger to
		// reject buffers which have the wrong size
		@@ -79,14 +87,6 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter,
		return BUFFER_REJECTED;
		}

		if (autoRefresh) {
		*autoRefresh = item.mAutoRefresh;
		}

		if (queuedBuffer) {
		*queuedBuffer = item.mQueuedBuffer;
		}

		// Release the previous buffer.
		#ifdef USE_HWC2
		err = updateAndReleaseLocked(item, &mPendingRelease);