Merge "Cancel layer update when a layer is about to be destroyed Bug #9310706"

1 files changed, 10 insertions, 0 deletions

diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 4708af141ec4..73082c1af6e5 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -213,6 +213,16 @@ void Layer::defer() {
     deferredUpdateScheduled = false;
 }
 
+void Layer::cancelDefer() {
+    renderer = NULL;
+    displayList = NULL;
+    deferredUpdateScheduled = false;
+    if (deferredList) {
+        delete deferredList;
+        deferredList = NULL;
+    }
+}
+
 void Layer::flush() {
     // renderer is checked as layer may be destroyed/put in layer cache with flush scheduled
     if (deferredList && renderer) {