commit b854651488f1d9073e690a58a2813802203874cf
author Steven Moreland <smoreland@google.com> Wed Jul 31 14:34:02 2019 -0700
committer Steven Moreland <smoreland@google.com> Wed Jul 31 14:35:18 2019 -0700
tree a0f1080ec2f7b367b60db1f9d7b139535dab8bda
parent cdb84a375b2fe8895752c00dbf0488830657a1ec

binder: No further overrides of *Object funcs.

None should be needed, and some places may rely on sp<> not being
constructed in their implementations.

Bug: 136027762
Test: TH
Change-Id: Ic4ab5f7c21fc9e4fd2c1761828398d315d0d0887

libs/binder/include/binder/Binder.h

diff --git a/libs/binder/include/binder/Binder.h b/libs/binder/include/binder/Binder.h
index cf3ef84..1537e69 100644
--- a/libs/binder/include/binder/Binder.h
+++ b/libs/binder/include/binder/Binder.h
@@ -54,9 +54,9 @@
     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

diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index b3a1d0b..e71541b 100644
--- a/libs/binder/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
@@ -61,9 +61,9 @@
     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();