commit 22571fd1836838b5d87a1828e383a1cd02edf52f
author Steven Moreland <smoreland@google.com> Thu Aug 01 15:14:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 01 15:14:14 2019 -0700
tree 57cd01bbd8d9d894c2db71bc844918e8ddcd97a9
parent c0a1d9a1385ad37438e30a89dedb3d332bc83c89
parent 785b7181cb9435c8f233a0583be028a1414717b3

Merge "binder: No further overrides of *Object funcs." am: 4fabf33599 am: f7ed9e8c29 am: b0f8a4e378
am: 785b7181cb

Change-Id: Ia81e5572e53298e4cfbaf1818c0e008cea1001a8

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();