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

Commit 51e5b96a authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: remove readIntPtr" am: 8e046890 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1495197

Change-Id: Idf5c69eddea6d18be37284bf51704d772240bb29
parents bdc325c6 8e046890

libs/binder/Parcel.cpp

+0 −11
Original line number Diff line number Diff line
@@ -1914,17 +1914,6 @@ double Parcel::readDouble() const 


#endif



status_t Parcel::readIntPtr(intptr_t *pArg) const

{

    return readAligned(pArg);

}





intptr_t Parcel::readIntPtr() const

{

    return readAligned<intptr_t>();

}



status_t Parcel::readBool(bool *pArg) const

{

    int32_t tmp = 0;

libs/binder/include/binder/Parcel.h

+0 −2
Original line number Diff line number Diff line
@@ -304,8 +304,6 @@ public: 
    status_t            readFloat(float *pArg) const;

    double              readDouble() const;

    status_t            readDouble(double *pArg) const;

    intptr_t            readIntPtr() const;

    status_t            readIntPtr(intptr_t *pArg) const;

    bool                readBool() const;

    status_t            readBool(bool *pArg) const;

    char16_t            readChar() const;

libs/binder/parcel_fuzzer/binder.cpp

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    PARCEL_READ_OPT_STATUS(uint64_t, readUint64),

    PARCEL_READ_OPT_STATUS(float, readFloat),

    PARCEL_READ_OPT_STATUS(double, readDouble),

    PARCEL_READ_OPT_STATUS(intptr_t, readIntPtr),

    PARCEL_READ_OPT_STATUS(bool, readBool),

    PARCEL_READ_OPT_STATUS(char16_t, readChar),

    PARCEL_READ_OPT_STATUS(int8_t, readByte),