summaryrefslogtreecommitdiffstats
path: root/libs/hwui/Layer.cpp
diff options
context:
space:
mode:
authorNancy Zheng <nzheng@google.com>2016-01-13 15:23:56 -0800
committerNancy Zheng <nzheng@google.com>2016-01-13 15:23:56 -0800
commit74dfcf90f18d8d0e1128707a5986c4fa94d70350 (patch)
treee7dafb136a6bd65211a07c709f9b6f6c7c352714 /libs/hwui/Layer.cpp
parenteebf168e43e4a455a74e949cc0d7e156b231a697 (diff)
downloadframeworks_base-74dfcf90f18d8d0e1128707a5986c4fa94d70350.zip
frameworks_base-74dfcf90f18d8d0e1128707a5986c4fa94d70350.tar.gz
frameworks_base-74dfcf90f18d8d0e1128707a5986c4fa94d70350.tar.bz2
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
Diffstat (limited to 'libs/hwui/Layer.cpp')
-rw-r--r--libs/hwui/Layer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index e16865e..62eeb43 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() {