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

Commit f7159a92 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into nyc-dev 

* changes:
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4 am: 953b08b7
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7
  Don't pad before calling writeInPlace().
parents 4af41a29 32da4bbe

libs/binder/Parcel.cpp

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