diff options
| author | 2021-10-18 19:58:02 +0000 | |
|---|---|---|
| committer | 2021-10-18 19:58:02 +0000 | |
| commit | a6ec70d679c28e260f6fca4d4b73ac42f5cafcd6 (patch) | |
| tree | 76b9958d3e97618b0ef008f6d25c488f61f80d80 | |
| parent | a09c4ff2f128ec275a726df1a0142c7be101c515 (diff) | |
| parent | eedde63b696be3ee5cf9200bc922c3472e2c70d4 (diff) | |
Merge "libbinder: make getBlobAshmemSize private"
| -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 |