Commit dda5d5d7 authored Sep 21, 2017 by Daniel Jarai Committed by android-build-merger Sep 21, 2017

Merge "Avoid closing invalid fds in GraphicBufferMapper" am: 8260e06c am:...

Merge "Avoid closing invalid fds in GraphicBufferMapper" am: 8260e06c am: 8fe617ea am: 9ef13167
am: b7d03db7

Change-Id: Id3a7dc51c56b4e13d6969dae14d6fa5e68b85057

parents ec9c7010 b7d03db7

libs/ui/GraphicBufferMapper.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ status_t GraphicBufferMapper::unlock(buffer_handle_t handle)
		{
		int32_t fenceFd = -1;
		status_t error = unlockAsync(handle, &fenceFd);
		if (error == NO_ERROR) {
		if (error == NO_ERROR && fenceFd >= 0) {
		sync_wait(fenceFd, -1);
		close(fenceFd);
		}