commit 11f9da310ac3129cd859ef98f7f10d897308a59b
author John Reck <jreck@google.com> Fri Jul 24 04:05:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 04:05:13 2015 +0000
tree a727b8190f837ae54494678511167bf40db53f98
parent 63af49102373ac575eee2a8c30e2facbb13e1ca5
parent bdb2a90570b6fcdcb85d010070f77f7cea61e41a

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

* commit 'bdb2a90570b6fcdcb85d010070f77f7cea61e41a':
  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();