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

services/surfaceflinger/SurfaceFlingerConsumer.cpp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,14 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter,
	return err;		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		// We call the rejecter here, in case the caller has a reason to
	// not accept this buffer. This is used by SurfaceFlinger to		// not accept this buffer. This is used by SurfaceFlinger to
	// reject buffers which have the wrong size		// reject buffers which have the wrong size
	@@ -79,14 +87,6 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter,
	return BUFFER_REJECTED;		return BUFFER_REJECTED;
	}		}

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

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

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