diff options
| author | 2021-10-18 21:27:29 +0000 | |
|---|---|---|
| committer | 2021-10-18 21:27:29 +0000 | |
| commit | 1ec5ab7eae3e02b432dff56fc248b1622714b77d (patch) | |
| tree | d80ba91758e83523cbdab77c24bde4c2217f9770 | |
| parent | 6db6c2dc37ff5dd59c154eb8593491464d9e15b3 (diff) | |
| parent | 7ed9465cdef5b2a6663c7b5284e52772436d42d1 (diff) | |
Merge "libbinder: make getBlobAshmemSize private" am: a6ec70d679 am: 1b4bf3fbd3 am: 3b4f8dcef3 am: 854e562741 am: 7ed9465cde
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1858429
Change-Id: I29ba1c9180dc92a299b052a22b3c0f90ca790780
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 4 | ||||
| -rw-r--r-- | libs/binder/tests/parcel_fuzzer/binder.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index cf30f17015..32056d9f10 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -1237,7 +1237,9 @@ public: */ size_t getOpenAshmemSize() const; - // TODO(b/202029388): Remove 'getBlobAshmemSize' once ABI can be changed. +private: + // TODO(b/202029388): Remove 'getBlobAshmemSize' once no prebuilts reference + // this size_t getBlobAshmemSize() const; }; diff --git a/libs/binder/tests/parcel_fuzzer/binder.cpp b/libs/binder/tests/parcel_fuzzer/binder.cpp index 55eb847436..8e8994bd98 100644 --- a/libs/binder/tests/parcel_fuzzer/binder.cpp +++ b/libs/binder/tests/parcel_fuzzer/binder.cpp @@ -284,7 +284,6 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { FUZZ_LOG() << "readObject: " << obj; }, PARCEL_READ_NO_STATUS(uid_t, readCallingWorkSourceUid), - PARCEL_READ_NO_STATUS(size_t, getBlobAshmemSize), PARCEL_READ_NO_STATUS(size_t, getOpenAshmemSize), // additional parcelable objects defined in libbinder |