commit 97dc9172b0e58979c63de0dedbab656399a62281
author Romain Guy <romainguy@google.com> Sun Sep 23 17:46:45 2012 -0700
committer Romain Guy <romainguy@google.com> Sun Sep 23 17:49:24 2012 -0700
tree 291da7b2a7b35e73821fa3660c7e1a96e983a5e4
parent 4285de3c8bc77856a2df98894f74bb7333f1d348

Avoid deadlock when deleting layers
Bug #7217459

Change-Id: I12bfa6c30c5030bd1b23ea6a3ce64240ab1dfba3

libs/hwui/Layer.cpp

diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 76b274b..fb525ee 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -50,6 +50,13 @@
     deleteTexture();
 }
 
+void Layer::freeResourcesLocked() {
+    if (colorFilter) {
+        Caches::getInstance().resourceCache.decrementRefcountLocked(colorFilter);
+        colorFilter = NULL;
+    }
+}
+
 void Layer::setPaint(SkPaint* paint) {
     OpenGLRenderer::getAlphaAndModeDirect(paint, &alpha, &mode);
 }