| commit | ddedd24e963fea1332125d2bdd43dbb709557f14 | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Fri Aug 24 15:38:07 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 24 15:38:07 2018 -0700 |
| tree | 8eb293ef5bd75cc83d1e28adc149300918745466 | |
| parent | 83c37379dafdf687da290cf412129ea21573dea9 [diff] | |
| parent | 9d10637e016f40b4fc58db4fd204174f03312c30 [diff] |
Merge changes Ie072511b,I6424f90c am: 9d10637e01 Change-Id: I06ca7319633534e38b45ab960f285a072cff84da
diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h index b37f2cf..f2766d6 100644 --- a/libs/hwui/TreeInfo.h +++ b/libs/hwui/TreeInfo.h
@@ -39,7 +39,7 @@ virtual void onError(const std::string& message) = 0; protected: - ~ErrorHandler() {} + virtual ~ErrorHandler() {} }; class TreeObserver {
diff --git a/libs/hwui/renderthread/RenderThread.h b/libs/hwui/renderthread/RenderThread.h index 689f518..e9c2649 100644 --- a/libs/hwui/renderthread/RenderThread.h +++ b/libs/hwui/renderthread/RenderThread.h
@@ -59,7 +59,7 @@ virtual void doFrame() = 0; protected: - ~IFrameCallback() {} + virtual ~IFrameCallback() {} }; struct VsyncSource {