summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-07-16 11:55:09 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-16 11:55:09 -0700
commitbfafdc2ee70aadcda10a157db578265cbec88170 (patch)
tree513230b73278ca3d15130201386a759b1ddab788
parentd55a427204e5ef968318e7a558c7da1c07203fea (diff)
parent8628dd02e6eb15571eb55b0e0d9ce3b951e9aa83 (diff)
Merge "libbinder: remove unneeded Parcel::objects."
am: 8628dd02e6 Change-Id: I4e5ff8bd5c03f7e04f8790c9a03460b76a253306
-rw-r--r--libs/binder/Parcel.cpp7
-rw-r--r--libs/binder/include/binder/Parcel.h4
2 files changed, 1 insertions, 10 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index baaf29a0a3..5bc3075f04 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -666,11 +666,6 @@ bool Parcel::enforceInterface(const String16& interface,
}
}
-const binder_size_t* Parcel::objects() const
-{
- return mObjects;
-}
-
size_t Parcel::objectsCount() const
{
return mObjectsSize;
@@ -2459,7 +2454,7 @@ void Parcel::print(TextOutput& to, uint32_t /*flags*/) const
} else if (dataSize() > 0) {
const uint8_t* DATA = data();
to << indent << HexDump(DATA, dataSize()) << dedent;
- const binder_size_t* OBJS = objects();
+ const binder_size_t* OBJS = mObjects;
const size_t N = objectsCount();
for (size_t i=0; i<N; i++) {
const flat_binder_object* flat
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index 681a031ddb..766213e1b3 100644
--- a/libs/binder/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
@@ -97,10 +97,6 @@ public:
void freeData();
-private:
- const binder_size_t* objects() const;
-
-public:
size_t objectsCount() const;
status_t errorCheck() const;