diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-04-28 12:08:15 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-04-28 12:08:15 -0700 |
| commit | 85e0c89ba55188ecc484538efbfdb570606fc1a2 (patch) | |
| tree | 9e5d618c4446b2e4933b2035b77c8fb846062f93 /libs/hwui/renderthread/RenderThread.cpp | |
| parent | 237790ec48e83d1623ce44dd968e15059121df56 (diff) | |
| parent | 1599b981fae5e606713e6c9a1698a7e36ef5ae09 (diff) | |
resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp
Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 9fb30c928c00..3c1c0bceba58 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -128,7 +128,7 @@ class DispatchFrameCallbacks : public RenderTask { private: RenderThread* mRenderThread; public: - DispatchFrameCallbacks(RenderThread* rt) : mRenderThread(rt) {} + explicit DispatchFrameCallbacks(RenderThread* rt) : mRenderThread(rt) {} virtual void run() override { mRenderThread->dispatchFrameCallbacks(); |