From 17035b0211a3c9d45ea46a99217a6acbe76e8fbe Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 3 Sep 2014 07:39:53 -0700 Subject: Have destroy call freePrefetchedLayers Bug: 17208461 There's a potential race condition between HardwareRenderer.destroy() being called (which calls destroyCanvasAndSurface()) and the renderer being finalized (which is what calls freePrefetchedLayers), during which time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL context. Fix this race condition by moving stopDrawing() and freePrefetchedLayers() into destroyCanvasAndSurface() where they should have been in the first place. Also, if we hit the assertion failure, dump the current state of Caches to try and provide more context for the failure. Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6 --- libs/hwui/LayerCache.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libs/hwui/LayerCache.cpp') diff --git a/libs/hwui/LayerCache.cpp b/libs/hwui/LayerCache.cpp index 13869aadea16..efa30ac36a6e 100644 --- a/libs/hwui/LayerCache.cpp +++ b/libs/hwui/LayerCache.cpp @@ -49,6 +49,10 @@ LayerCache::~LayerCache() { // Size management /////////////////////////////////////////////////////////////////////////////// +size_t LayerCache::getCount() { + return mCache.size(); +} + uint32_t LayerCache::getSize() { return mSize; } -- cgit v1.2.3-59-g8ed1b