commit 1488f79776d043ce599b7d86d9f86df102c6603f
author John Reck <jreck@google.com> Fri Dec 11 22:48:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 11 22:48:56 2015 +0000
tree eaa962111c212791218bdd944f6965387436eb87
parent b53b9f99ad7e27eedbe304419113e573e2c8e555
parent 89add11bb4c4a3cae38d84d1151e60617efb26a5

Merge "resolve merge conflicts of f1df0f59c1 to master."

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 94a11f1..eaa1c33 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -103,7 +103,7 @@
 
 void Caches::terminate() {
     if (!mInitialized) return;
-    mRegionMesh.release();
+    mRegionMesh.reset(nullptr);
 
     fboCache.clear();
 

libs/hwui/Layer.cpp

diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 489ebc1..0fe20ad 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -248,7 +248,7 @@
 void Layer::cancelDefer() {
     renderNode = nullptr;
     deferredUpdateScheduled = false;
-    deferredList.release();
+    deferredList.reset(nullptr);
 }
 
 void Layer::flush() {