Commit b2ccd5ad authored Oct 20, 2018 by android-build-team Robot

Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195,...

Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499, 5317874, 5317875, 5317876, 5318243, 5318244, 5318537, 5318538, 5318539, 5318540, 5318541, 5318542, 5318543, 5318544, 5318545, 5318546, 5315210, 5317756, 5318557, 5318558, 5318559, 5318560, 5318561, 5318339, 5318547, 5318548, 5318549, 5318562, 5318563, 5318564, 5318565, 5318566, 5318172, 5318173, 5318174, 5318550, 5318401, 5318196, 5317889, 5318175, 5318176, 5318577, 5318578, 5318579, 5318580, 5318581, 5318503, 5318390, 5318505, 5318341, 5318551] into pi-qpr1-release

Change-Id: Ie695cbef0f3680af38bdf883b52548a4be967548

parents ee5a769a 955ef12c

libs/ui/GraphicBuffer.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,10 @@ status_t GraphicBuffer::flatten(void& buffer, size_t& size, int& fds, size_t&

		status_t GraphicBuffer::unflatten(
		void const& buffer, size_t& size, int const& fds, size_t& count) {
		if (size < 12 * sizeof(int)) {
		android_errorWriteLog(0x534e4554, "114223584");
		return NO_MEMORY;
		}

		int const* buf = static_cast<int const*>(buffer);