diff options
| author | 2015-12-11 14:47:40 -0800 | |
|---|---|---|
| committer | 2015-12-11 14:47:40 -0800 | |
| commit | 89add11bb4c4a3cae38d84d1151e60617efb26a5 (patch) | |
| tree | f1a69a4a6045da8c224ecc5abec7d3c60a84caba /libs/hwui/Layer.cpp | |
| parent | 5f519e77a5f240fac2785e2d3f1c0637e499ac9e (diff) | |
| parent | f1df0f59c174687b5f9a8ca0163fea3921915ae8 (diff) | |
resolve merge conflicts of f1df0f59c1 to master.
Change-Id: Ia0ae0f753541f5203a4a3683721361c5e90ddae8
Diffstat (limited to 'libs/hwui/Layer.cpp')
| -rw-r--r-- | libs/hwui/Layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp index 489ebc116a2a..0fe20ad1b662 100644 --- a/libs/hwui/Layer.cpp +++ b/libs/hwui/Layer.cpp @@ -248,7 +248,7 @@ void Layer::defer(const OpenGLRenderer& rootRenderer) { void Layer::cancelDefer() { renderNode = nullptr; deferredUpdateScheduled = false; - deferredList.release(); + deferredList.reset(nullptr); } void Layer::flush() { |