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

Commit a753a334 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "libbinder: Parcel.h: remove unused/internal funcs"

parents ef211707 b1c8120b

libs/binder/Parcel.cpp

+5 −17
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ enum { 
    BLOB_ASHMEM_MUTABLE = 2,

};



void acquire_object(const sp<ProcessState>& proc,

static void acquire_object(const sp<ProcessState>& proc,

    const flat_binder_object& obj, const void* who, size_t* outAshmemSize)

{

    switch (obj.hdr.type) {
@@ -135,12 +135,6 @@ void acquire_object(const sp<ProcessState>& proc, 
    ALOGD("Invalid object type 0x%08x", obj.hdr.type);

}



void acquire_object(const sp<ProcessState>& proc,

    const flat_binder_object& obj, const void* who)

{

    acquire_object(proc, obj, who, nullptr);

}



static void release_object(const sp<ProcessState>& proc,

    const flat_binder_object& obj, const void* who, size_t* outAshmemSize)

{
@@ -189,19 +183,13 @@ static void release_object(const sp<ProcessState>& proc, 
    ALOGE("Invalid object type 0x%08x", obj.hdr.type);

}



void release_object(const sp<ProcessState>& proc,

    const flat_binder_object& obj, const void* who)

{

    release_object(proc, obj, who, nullptr);

}



inline static status_t finish_flatten_binder(

    const sp<IBinder>& /*binder*/, const flat_binder_object& flat, Parcel* out)

{

    return out->writeObject(flat, false);

}



status_t flatten_binder(const sp<ProcessState>& /*proc*/,

static status_t flatten_binder(const sp<ProcessState>& /*proc*/,

    const sp<IBinder>& binder, Parcel* out)

{

    flat_binder_object obj;
@@ -243,7 +231,7 @@ status_t flatten_binder(const sp<ProcessState>& /*proc*/, 
    return finish_flatten_binder(binder, obj, out);

}



status_t flatten_binder(const sp<ProcessState>& /*proc*/,

static status_t flatten_binder(const sp<ProcessState>& /*proc*/,

    const wp<IBinder>& binder, Parcel* out)

{

    flat_binder_object obj;
@@ -299,7 +287,7 @@ inline static status_t finish_unflatten_binder( 
    return NO_ERROR;

}



status_t unflatten_binder(const sp<ProcessState>& proc,

static status_t unflatten_binder(const sp<ProcessState>& proc,

    const Parcel& in, sp<IBinder>* out)

{

    const flat_binder_object* flat = in.readObject(false);
@@ -318,7 +306,7 @@ status_t unflatten_binder(const sp<ProcessState>& proc, 
    return BAD_TYPE;

}



status_t unflatten_binder(const sp<ProcessState>& proc,

static status_t unflatten_binder(const sp<ProcessState>& proc,

    const Parcel& in, wp<IBinder>* out)

{

    const flat_binder_object* flat = in.readObject(false);

libs/binder/include/binder/Parcel.h

+0 −17
Original line number Diff line number Diff line
@@ -918,23 +918,6 @@ inline TextOutput& operator<<(TextOutput& to, const Parcel& parcel) 
    return to;

}



// ---------------------------------------------------------------------------



// Generic acquire and release of objects.

void acquire_object(const sp<ProcessState>& proc,

                    const flat_binder_object& obj, const void* who);

void release_object(const sp<ProcessState>& proc,

                    const flat_binder_object& obj, const void* who);



void flatten_binder(const sp<ProcessState>& proc,

                    const sp<IBinder>& binder, flat_binder_object* out);

void flatten_binder(const sp<ProcessState>& proc,

                    const wp<IBinder>& binder, flat_binder_object* out);

status_t unflatten_binder(const sp<ProcessState>& proc,

                          const flat_binder_object& flat, sp<IBinder>* out);

status_t unflatten_binder(const sp<ProcessState>& proc,

                          const flat_binder_object& flat, wp<IBinder>* out);



}; // namespace android



// ---------------------------------------------------------------------------