commit 32da4bbe1ec686aa91a3f819950b33c452f4e5cd
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 16 18:57:37 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 16 18:57:37 2018 +0000
tree f8a831c246dab8607f64f20435d3e67c88778fbe
parent 81a160b19e7a0b31f4ae85bb037db086f08217da
parent 953b08b7c01f7de587fb1d9a795b237d6caa5710

[automerger] Don't pad before calling writeInPlace(). am: 732132b765 am: a6a5c3fa47 am: 325909a4e4 am: 953b08b7c0

Change-Id: Ic029be2236a7ec7f4425b0f3095274c78d35ea3b

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index e5a9346..c3a31fb 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;