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

Commit 370b07ff 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

Change-Id: I360013fdd9e679c39ecf9899e547e448ce55b27f
parents 3884672b 4a1214cb
Loading
Loading
Loading
Loading
+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;