Commit a0139728 authored Apr 16, 2018 by Android Build Merger (Role)

[automerger] Don't pad before calling writeInPlace(). am: 732132b7 am:...

[automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4 am: 953b08b7 am: 32da4bbe

Change-Id: Idc1c74bc23e6de9a7d0232ef4e557f52e3701d84

parents 2d14de5c 32da4bbe

libs/binder/Parcel.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1285,7 +1285,7 @@ status_t Parcel::write(const FlattenableHelperInterface& val)
		if (err) return err;

		// payload
		void* const buf = this->writeInplace(pad_size(len));
		void* const buf = this->writeInplace(len);
		if (buf == NULL)
		return BAD_VALUE;