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

Commit 1119c515 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes I30c813d3,Ie3eb90ad am: 9c6cc875 am: 775fe122 am: c323ac13 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1507785

Change-Id: I56d44c52936c029a43b8d5a6363d6af234117960
parents c12fbffe c323ac13

libs/binder/BpBinder.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -137,8 +137,8 @@ BpBinder* BpBinder::create(int32_t handle) { 
}

}





BpBinder::BpBinder(int32_t handle, int32_t trackedUid)

BpBinder::BpBinder(int32_t handle, int32_t trackedUid)

    : mHandle(handle)

    : mStability(0)

    , mStability(0)

    , mHandle(handle)

    , mAlive(1)

    , mAlive(1)

    , mObitsSent(0)

    , mObitsSent(0)

    , mObituaries(nullptr)

    , mObituaries(nullptr)

libs/binder/include/binder/BpBinder.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -109,19 +109,18 @@ public: 
        KeyedVector<const void*, entry_t> mObjects;

        KeyedVector<const void*, entry_t> mObjects;

    };

    };





protected:

private:

                        BpBinder(int32_t handle,int32_t trackedUid);

                        BpBinder(int32_t handle,int32_t trackedUid);

    virtual             ~BpBinder();

    virtual             ~BpBinder();

    virtual void        onFirstRef();

    virtual void        onFirstRef();

    virtual void        onLastStrongRef(const void* id);

    virtual void        onLastStrongRef(const void* id);

    virtual bool        onIncStrongAttempted(uint32_t flags, const void* id);

    virtual bool        onIncStrongAttempted(uint32_t flags, const void* id);





private:

    const   int32_t             mHandle;



    friend ::android::internal::Stability;

    friend ::android::internal::Stability;

            int32_t             mStability;

            int32_t             mStability;





    const   int32_t             mHandle;



    struct Obituary {

    struct Obituary {

        wp<DeathRecipient> recipient;

        wp<DeathRecipient> recipient;

        void* cookie;

        void* cookie;