am 34d89c6b: am 836d335f: Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev (fa017cd3) · Commits · e / os / android_frameworks_base

libs/hwui/Caches.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -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();