From 059476a24502500bbc277b86f9a4f7e840d1b5f5 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Mon, 29 Sep 2014 17:09:53 -0700 Subject: [PATCH] Avoid creating Caches instance with gfxinfo dump bug:17509891 Change-Id: I182851068ba04926d60226b3ace95efea59eac45 --- libs/hwui/RenderNode.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 254492ff4384d..70ff6e5f575f1 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -50,10 +50,13 @@ void RenderNode::outputLogBuffer(int fd) { fprintf(file, "\nRecent DisplayList operations\n"); logBuffer.outputCommands(file); - String8 cachesLog; - Caches::getInstance().dumpMemoryUsage(cachesLog); - fprintf(file, "\nCaches:\n%s", cachesLog.string()); - fprintf(file, "\n"); + if (Caches::hasInstance()) { + String8 cachesLog; + Caches::getInstance().dumpMemoryUsage(cachesLog); + fprintf(file, "\nCaches:\n%s\n", cachesLog.string()); + } else { + fprintf(file, "\nNo caches instance.\n"); + } fflush(file); }