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

Commit 456d35b3 authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am e4ea03f7: am 80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel" 

* commit 'e4ea03f7':
  binder: Add {read,write}Uint32 methods to Parcel
parents b01eea0a e4ea03f7

include/binder/Parcel.h

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public: 
    void*               writeInplace(size_t len);

    status_t            writeUnpadded(const void* data, size_t len);

    status_t            writeInt32(int32_t val);

    status_t            writeUint32(uint32_t val);

    status_t            writeInt64(int64_t val);

    status_t            writeFloat(float val);

    status_t            writeDouble(double val);
@@ -152,6 +153,8 @@ public: 
    const void*         readInplace(size_t len) const;

    int32_t             readInt32() const;

    status_t            readInt32(int32_t *pArg) const;

    uint32_t            readUint32() const;

    status_t            readUint32(uint32_t *pArg) const;

    int64_t             readInt64() const;

    status_t            readInt64(int64_t *pArg) const;

    float               readFloat() const;

libs/binder/Parcel.cpp

+15 −0
Original line number Diff line number Diff line
@@ -645,6 +645,12 @@ status_t Parcel::writeInt32(int32_t val) 
{

    return writeAligned(val);

}



status_t Parcel::writeUint32(uint32_t val)

{

    return writeAligned(val);

}



status_t Parcel::writeInt32Array(size_t len, const int32_t *val) {

    if (!val) {

        return writeAligned(-1);
@@ -1033,6 +1039,15 @@ int32_t Parcel::readInt32() const 
    return readAligned<int32_t>();

}



status_t Parcel::readUint32(uint32_t *pArg) const

{

    return readAligned(pArg);

}



uint32_t Parcel::readUint32() const

{

    return readAligned<uint32_t>();

}



status_t Parcel::readInt64(int64_t *pArg) const

{