commit f6384b4a1081a33bdb7f64da0ae3a420130de625
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 16 18:57:40 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 16 18:57:40 2018 +0000
tree 2d2808b46e158ef04120493b78736e66529fc49f
parent 2de1de1499e6ec6575bc5f9bbaa96d621ec1eb3a
parent 6fccb21cd7983b0a5edeca49ef60528160db3d13

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

Change-Id: Id867385a5a598489152c7b978cfd40e726f7dfb9

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;