commit 42eda1ed42a7f1cc751dd57b858be75b06179dae
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 11 09:53:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 11 09:53:53 2018 +0000
tree f9847429d499e53881af1c32a9be805e66590052
parent 75061f171dfe7da6d73479dfcd6119006dd1e735
parent a01397282d80897e9df9391614a090176322d54b

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

* changes:
  [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().

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index cc9f687..e5a34c2 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1285,7 +1285,7 @@
     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;