Merge "libbinder: remove unneeded Parcel::objects." am: 8628dd02e6 am: bfafdc2ee7 am: a015b88907

am: bd2fb9fe5e

Change-Id: I67a20bfa0c24b99a0ad5c5149f7db2506cbabb1a

2 files changed, 1 insertions, 10 deletions

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 171f8d3398..badf6cb7ae 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 75586d8dae..de13d81fb4 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;