commit 497cb6c0a9818c5ba27df3e5a50878144505405f
author Chris Craik <ccraik@google.com> Thu Oct 02 20:02:42 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 02 20:02:43 2014 +0000
tree 37cd11f1daa5a6e63071e9edb9ea2d85f71c536e
parent 438fe5937f3bc04087f48b511a799f9f6cf5a205
parent 059476a24502500bbc277b86f9a4f7e840d1b5f5

Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 254492f..70ff6e5 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -50,10 +50,13 @@
     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);
 }