From 74dfcf90f18d8d0e1128707a5986c4fa94d70350 Mon Sep 17 00:00:00 2001 From: Nancy Zheng Date: Wed, 13 Jan 2016 15:23:56 -0800 Subject: Pulling in https://android-review.googlesource.com/#/c/186482/1 Fix memory leak in HWUI std::unique_ptr::release just releases the ownership of the managed object. To delete the object, std::unique_ptr::reset function should be called. Bug: 26116596 Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3 --- libs/hwui/Layer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/Layer.cpp') diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp index e16865ede160..62eeb43a2e2e 100644 --- a/libs/hwui/Layer.cpp +++ b/libs/hwui/Layer.cpp @@ -251,7 +251,7 @@ void Layer::defer(const OpenGLRenderer& rootRenderer) { void Layer::cancelDefer() { renderNode = nullptr; deferredUpdateScheduled = false; - deferredList.release(); + deferredList.reset(nullptr); } void Layer::flush() { -- cgit v1.2.3-59-g8ed1b