Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ecfa8f3 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: remove unneeded Parcel::objects." am: 8628dd02 am: bfafdc2e am: a015b889

am: bd2fb9fe

Change-Id: I67a20bfa0c24b99a0ad5c5149f7db2506cbabb1a
parents 3e446c96 bd2fb9fe
Loading
Loading
Loading
Loading
+1 −6
Original line number Original line Diff line number Diff line
@@ -666,11 +666,6 @@ bool Parcel::enforceInterface(const String16& interface,
    }
    }
}
}


const binder_size_t* Parcel::objects() const
{
    return mObjects;
}

size_t Parcel::objectsCount() const
size_t Parcel::objectsCount() const
{
{
    return mObjectsSize;
    return mObjectsSize;
@@ -2459,7 +2454,7 @@ void Parcel::print(TextOutput& to, uint32_t /*flags*/) const
    } else if (dataSize() > 0) {
    } else if (dataSize() > 0) {
        const uint8_t* DATA = data();
        const uint8_t* DATA = data();
        to << indent << HexDump(DATA, dataSize()) << dedent;
        to << indent << HexDump(DATA, dataSize()) << dedent;
        const binder_size_t* OBJS = objects();
        const binder_size_t* OBJS = mObjects;
        const size_t N = objectsCount();
        const size_t N = objectsCount();
        for (size_t i=0; i<N; i++) {
        for (size_t i=0; i<N; i++) {
            const flat_binder_object* flat
            const flat_binder_object* flat
+0 −4
Original line number Original line Diff line number Diff line
@@ -97,10 +97,6 @@ public:


    void                freeData();
    void                freeData();


private:
    const binder_size_t* objects() const;

public:
    size_t              objectsCount() const;
    size_t              objectsCount() const;
    
    
    status_t            errorCheck() const;
    status_t            errorCheck() const;