commit d297b1b9949904fb815e98765d882d4cd3ca9b10
author Chris Craik <ccraik@google.com> Thu Oct 02 20:12:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 20:12:59 2014 +0000
tree 6841bbe665acde05f3c2c28f8a7ea9c2253db38f
parent 204b30191a77feb6cf56f2aab7de83ea6017b6d2
parent ab8f73a7f17d07bdb4ccb3b6971d3ddc8534bd7d

am ab8f73a7: am 497cb6c0: Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev

* commit 'ab8f73a7f17d07bdb4ccb3b6971d3ddc8534bd7d':
  Avoid creating Caches instance with gfxinfo dump

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);
 }