Commit 4432b0c4 authored May 16, 2017 by Dan Stoza Committed by android-build-merger May 16, 2017

Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:...

Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c060 am: 970bb515 am: 78976cea am: 2fe15aa6 am: cce83f15 am: 9a44ee07 am: 787aa48f am: f69675e5 am: d65a388e am: b829d2ab am: 79a34dd2
am: a1b1e635

Change-Id: Idfd63642dda3ae741056b75c9c9ddccd63feb76f

libs/gui/Surface.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,12 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) {
		return result;
		}

		if (buf < 0 \|\| buf >= NUM_BUFFER_SLOTS) {
		ALOGE("dequeueBuffer: IGraphicBufferProducer returned invalid slot number %d", buf);
		android_errorWriteLog(0x534e4554, "36991414"); // SafetyNet logging
		return FAILED_TRANSACTION;
		}

		Mutex::Autolock lock(mMutex);

		sp<GraphicBuffer>& gbuf(mSlots[buf].buffer);