Merge changes Ie072511b,I6424f90c am: 9d10637e01 am: ddedd24e96

am: 57d7cabbf5 Change-Id: Ic92512281269ceedbbfb197e1d7d0a230bf2317f
2018-08-24 15:54:32 -07:00
parent 6a8b3af3d8 57d7cabbf5
commit f15c333ddc
2 changed files with 2 additions and 2 deletions
--- a/libs/hwui/TreeInfo.h
+++ b/libs/hwui/TreeInfo.h
@@ -39,7 +39,7 @@ public:
    virtual void onError(const std::string& message) = 0;

 protected:
-    ~ErrorHandler() {}
+    virtual ~ErrorHandler() {}
 };

 class TreeObserver {
--- a/libs/hwui/renderthread/RenderThread.h
+++ b/libs/hwui/renderthread/RenderThread.h
@@ -59,7 +59,7 @@ public:
    virtual void doFrame() = 0;

 protected:
-    ~IFrameCallback() {}
+    virtual ~IFrameCallback() {}
 };

 struct VsyncSource {