summaryrefslogtreecommitdiff
path: root/libs/binder/Parcel.cpp
diff options
context:
space:
mode:
author Martijn Coenen <maco@google.com> 2018-05-11 03:04:01 -0700
committer android-build-merger <android-build-merger@google.com> 2018-05-11 03:04:01 -0700
commit370b07fff3ccbd9167e31079f82b8d3f00cc0d1b (patch)
treecfb1830f364792811e6475efe9f2e2a313317255 /libs/binder/Parcel.cpp
parent3884672b0dc60a864c86a0ff21ee1f1996481a39 (diff)
parent4a1214cbbd9657ce3a2a59e65a70915f0bce3277 (diff)
Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into oc-dev
am: 4a1214cbbd Change-Id: I360013fdd9e679c39ecf9899e547e448ce55b27f
Diffstat (limited to 'libs/binder/Parcel.cpp')
-rw-r--r--libs/binder/Parcel.cpp2
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;