commit cdb4040245307a2b1660c5f02d03d7b2ab3a33b7
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 16 18:57:42 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 16 18:57:42 2018 +0000
tree 20e311ea4cced19b6217bc67cf6c5156c12b3d0c
parent 2944d59824abdae1438ea350509e2e6fecadad0d
parent 04ab0619bedf4f15f975196a4a96a3f2067563b2

[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

Change-Id: Id2ecf4e01ae29b991fa54794f830ad1cc82a7d22

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 07e856e..84a561b 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1277,7 +1277,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;