Merge "Revert "Delete RenderProxy off of the cleaner thread"" into sc-dev

1 files changed, 2 insertions, 6 deletions

diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h
index 5f6b5cde652d..1b0f22e75a2d 100644
--- a/libs/hwui/renderthread/RenderProxy.h
+++ b/libs/hwui/renderthread/RenderProxy.h
@@ -62,14 +62,10 @@ enum {
  * references RenderProxy fields. This is safe as RenderProxy cannot
  * be deleted if it is blocked inside a call.
  */
-class RenderProxy final {
+class RenderProxy {
 public:
     RenderProxy(bool opaque, RenderNode* rootNode, IContextFactory* contextFactory);
-    ~RenderProxy();
-
-    // Schedules a delete of the RenderProxy at a later date. Avoids blocking the current thread
-    // on destruction which ~RenderProxy does by default.
-    static void asyncDelete(RenderProxy*);
+    virtual ~RenderProxy();
 
     // Won't take effect until next EGLSurface creation
     void setSwapBehavior(SwapBehavior swapBehavior);