diff options
| author | 2020-11-12 16:37:37 +0000 | |
|---|---|---|
| committer | 2020-11-12 16:37:37 +0000 | |
| commit | 51e5b96aafe1bcca5efee42b58a86caf4912d1c0 (patch) | |
| tree | fde70c131fb3f3789567ddf873f469379fa0ce8f | |
| parent | bdc325c6044d8380d65f8bb0be34806a29f20b77 (diff) | |
| parent | 8e046890e94f46fb67917df0f374a5f4f40eb6c5 (diff) | |
Merge "libbinder: remove readIntPtr" am: 8e046890e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1495197
Change-Id: Idf5c69eddea6d18be37284bf51704d772240bb29
| -rw-r--r-- | libs/binder/Parcel.cpp | 11 | ||||
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 2 | ||||
| -rw-r--r-- | libs/binder/parcel_fuzzer/binder.cpp | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index feeb819a8a..55b5b354bc 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -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; diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index 84bfe38032..2986adecc7 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -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; diff --git a/libs/binder/parcel_fuzzer/binder.cpp b/libs/binder/parcel_fuzzer/binder.cpp index e5c6333b79..a94f06fa85 100644 --- a/libs/binder/parcel_fuzzer/binder.cpp +++ b/libs/binder/parcel_fuzzer/binder.cpp @@ -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), |