Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev

Browse Source
This commit is contained in:
Romain Guy
2013-08-16 21:56:39 +00:00
committed by Android (Google) Code Review
parent 3c226bf6ac b0a41ed3dc
commit 836d335f9a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/Caches.cpp
View File

@@ -331,6 +331,11 @@ void Caches::deleteDisplayListDeferred(DisplayList* displayList) {
void Caches::flush(FlushMode mode) { void Caches::flush(FlushMode mode) {
FLUSH_LOGD("Flushing caches (mode %d)", mode); FLUSH_LOGD("Flushing caches (mode %d)", mode);
// We must stop tasks before clearing caches
if (mode > kFlushMode_Layers) {
tasks.stop();
}
switch (mode) { switch (mode) {
case kFlushMode_Full: case kFlushMode_Full:
textureCache.clear(); textureCache.clear();
@@ -345,7 +350,6 @@ void Caches::flush(FlushMode mode) {
fontRenderer->flush(); fontRenderer->flush();
textureCache.flush(); textureCache.flush();
pathCache.clear(); pathCache.clear();
tasks.stop();
// fall through // fall through
case kFlushMode_Layers: case kFlushMode_Layers:
layerCache.clear(); layerCache.clear();