Commit 5b0043ff authored May 11, 2018 by TreeHugger Robot Committed by Android (Google) Code Review May 11, 2018

Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into nyc-mr2-dev

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

parents 634696f9 04ab0619

libs/binder/Parcel.cpp

+1 −1

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

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