drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '836d335f9a43e1ebcd2291b211ac04116971124e':
  Prevent ANR in apps using drawPath() Bug #10347089
This commit is contained in:
Romain Guy
2013-08-16 15:03:51 -07:00
committed by Android Git Automerger
parent 6c9b6aea12 836d335f9a
commit 34d89c6b05
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) {
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();
@ -345,7 +350,6 @@ void Caches::flush(FlushMode mode) {
fontRenderer->flush();
textureCache.flush();
pathCache.clear();
tasks.stop();
// fall through
case kFlushMode_Layers:
layerCache.clear();