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

Commit 476ee43e 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 am:... 

Merge "binder: No further overrides of *Object funcs." am: 4fabf335 am: f7ed9e8c am: b0f8a4e3 am: 785b7181
am: 22571fd1

Change-Id: Ida76caa181700f4b86e252d7ea483bb3cb88e686
parents dcd83fbd 22571fd1

libs/binder/include/binder/Binder.h

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

                                        void* object,

                                        void* cleanupCookie,

                                        object_cleanup_func func);

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

    virtual void        detachObject(const void* objectID);

                                        object_cleanup_func func) final;

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

    virtual void        detachObject(const void* objectID) final;



    virtual BBinder*    localBinder();

libs/binder/include/binder/BpBinder.h

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

                                        void* object,

                                        void* cleanupCookie,

                                        object_cleanup_func func);

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

    virtual void        detachObject(const void* objectID);

                                        object_cleanup_func func) final;

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

    virtual void        detachObject(const void* objectID) final;



    virtual BpBinder*   remoteBinder();