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

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

Merge "binder: No further overrides of *Object funcs." 

am: 4fabf335

Change-Id: I0170cdea39369272ffa621509911e1f73f546529
parents 28347970 4fabf335

libs/binder/include/binder/Binder.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -54,9 +54,9 @@ public: 
    virtual void        attachObject(   const void* objectID,

    virtual void        attachObject(   const void* objectID,

                                        void* object,

                                        void* object,

                                        void* cleanupCookie,

                                        void* cleanupCookie,

                                        object_cleanup_func func);

                                        object_cleanup_func func) final;

    virtual void*       findObject(const void* objectID) const;

    virtual void*       findObject(const void* objectID) const final;

    virtual void        detachObject(const void* objectID);

    virtual void        detachObject(const void* objectID) final;





    virtual BBinder*    localBinder();

    virtual BBinder*    localBinder();

libs/binder/include/binder/BpBinder.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -61,9 +61,9 @@ public: 
    virtual void        attachObject(   const void* objectID,

    virtual void        attachObject(   const void* objectID,

                                        void* object,

                                        void* object,

                                        void* cleanupCookie,

                                        void* cleanupCookie,

                                        object_cleanup_func func);

                                        object_cleanup_func func) final;

    virtual void*       findObject(const void* objectID) const;

    virtual void*       findObject(const void* objectID) const final;

    virtual void        detachObject(const void* objectID);

    virtual void        detachObject(const void* objectID) final;





    virtual BpBinder*   remoteBinder();

    virtual BpBinder*   remoteBinder();