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

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

Merge "libbinder: finish{F,Unf}lattenBinder symmetry"

parents eed76146 34b48cb7

libs/binder/Parcel.cpp

+5 −6
Original line number Diff line number Diff line
@@ -164,12 +164,8 @@ static void release_object(const sp<ProcessState>& proc, 
    ALOGE("Invalid object type 0x%08x", obj.hdr.type);

}



status_t Parcel::finishFlattenBinder(

    const sp<IBinder>& binder, const flat_binder_object& flat)

status_t Parcel::finishFlattenBinder(const sp<IBinder>& binder)

{

    status_t status = writeObject(flat, false);

    if (status != OK) return status;



    internal::Stability::tryMarkCompilationUnit(binder.get());

    auto category = internal::Stability::getCategory(binder.get());

    return writeInt32(category.repr());
@@ -238,7 +234,10 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) 


    obj.flags |= schedBits;



    return finishFlattenBinder(binder, obj);

    status_t status = writeObject(obj, false);

    if (status != OK) return status;



    return finishFlattenBinder(binder);

}



status_t Parcel::unflattenBinder(sp<IBinder>* out) const

libs/binder/include/binder/Parcel.h

+1 −2
Original line number Diff line number Diff line
@@ -522,8 +522,7 @@ private: 
    status_t            validateReadData(size_t len) const;

    void                updateWorkSourceRequestHeaderPosition() const;



    status_t            finishFlattenBinder(const sp<IBinder>& binder,

                                            const flat_binder_object& flat);

    status_t            finishFlattenBinder(const sp<IBinder>& binder);

    status_t            finishUnflattenBinder(const sp<IBinder>& binder, sp<IBinder>* out) const;

    status_t            flattenBinder(const sp<IBinder>& binder);

    status_t            unflattenBinder(sp<IBinder>* out) const;