diff options
| author | 2018-05-11 09:53:53 +0000 | |
|---|---|---|
| committer | 2018-05-11 09:53:53 +0000 | |
| commit | 4a1214cbbd9657ce3a2a59e65a70915f0bce3277 (patch) | |
| tree | 5f66623098048f4643972f1bd9d3ee744cf80658 | |
| parent | c78029ca3d018d23c1dabdadff9b27f239ef889c (diff) | |
| parent | cdb4040245307a2b1660c5f02d03d7b2ab3a33b7 (diff) | |
Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into oc-dev
* changes:
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0 am: 32da4bbe1e am: a01397282d am: 6fccb21cd7 am: f6384b4a10 am: 04ab0619be
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0 am: 32da4bbe1e am: a01397282d am: 6fccb21cd7 am: f6384b4a10
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0 am: 32da4bbe1e am: a01397282d am: 6fccb21cd7
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0 am: 32da4bbe1e am: a01397282d
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0 am: 32da4bbe1e
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4
[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47
[automerger] Don't pad before calling writeInPlace(). am: 732132b765
Don't pad before calling writeInPlace().
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 0985ac8088..9d96dd6cb7 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1277,7 +1277,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; |