Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b529ce58 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into oc-dev am: 4a1214cb 

am: 370b07ff

Change-Id: Ia1ad35d6bdec92f25de79793071bbe04a4a34005
parents 21a1c612 370b07ff

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;