summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-07-23 19:20:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-23 19:20:47 +0000
commite5783e58db79f342ae0e264dc9c902cca92fc7bb (patch)
treebe3b5dc6e36919222473d4d955e0ca783ac592d6 /libs
parent5a18b4bfe2cf30df2e18047c155fecc6433ed52c (diff)
parent2abf0f24af60b8644d5b61eed9666793083546ee (diff)
downloadframeworks_base-e5783e58db79f342ae0e264dc9c902cca92fc7bb.zip
frameworks_base-e5783e58db79f342ae0e264dc9c902cca92fc7bb.tar.gz
frameworks_base-e5783e58db79f342ae0e264dc9c902cca92fc7bb.tar.bz2
am 2abf0f24: Fix a race condition that could cause lockup
* commit '2abf0f24af60b8644d5b61eed9666793083546ee': Fix a race condition that could cause lockup
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/Caches.cpp5
1 files changed, 0 insertions, 5 deletions
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::clearGarbage() {
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();