From eedde63b696be3ee5cf9200bc922c3472e2c70d4 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 14 Oct 2021 14:39:42 -0700 Subject: libbinder: make getBlobAshmemSize private In preparation for removing it. There are currently 3 prebuilts in the Android source tree which reference this (from one device!). Bug: 202029388 Test: N/A Change-Id: Ic025418d9b4ca35cf4bfd1518de4d6db68de015d --- libs/binder/include/binder/Parcel.h | 4 +++- 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> 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 -- cgit v1.2.3-59-g8ed1b