commit e5783e58db79f342ae0e264dc9c902cca92fc7bb
author John Reck <jreck@google.com> Thu Jul 23 19:20:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 23 19:20:47 2015 +0000
tree be3b5dc6e36919222473d4d955e0ca783ac592d6
parent 5a18b4bfe2cf30df2e18047c155fecc6433ed52c
parent 2abf0f24af60b8644d5b61eed9666793083546ee

am 2abf0f24: Fix a race condition that could cause lockup

* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 1030451..aa73d44 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -248,11 +248,6 @@
 void Caches::flush(FlushMode mode) {
     FLUSH_LOGD("Flushing caches (mode %d)", mode);
 
-    // We must stop tasks before clearing caches
-    if (mode > kFlushMode_Layers) {
-        tasks.stop();
-    }
-
     switch (mode) {
         case kFlushMode_Full:
             textureCache.clear();