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

* commit '497cb6c0a9818c5ba27df3e5a50878144505405f':
  Avoid creating Caches instance with gfxinfo dump
This commit is contained in:
Chris Craik
2014-10-02 20:08:21 +00:00
committed by Android Git Automerger

View File

@ -50,10 +50,13 @@ void RenderNode::outputLogBuffer(int fd) {
fprintf(file, "\nRecent DisplayList operations\n"); fprintf(file, "\nRecent DisplayList operations\n");
logBuffer.outputCommands(file); logBuffer.outputCommands(file);
String8 cachesLog; if (Caches::hasInstance()) {
Caches::getInstance().dumpMemoryUsage(cachesLog); String8 cachesLog;
fprintf(file, "\nCaches:\n%s", cachesLog.string()); Caches::getInstance().dumpMemoryUsage(cachesLog);
fprintf(file, "\n"); fprintf(file, "\nCaches:\n%s\n", cachesLog.string());
} else {
fprintf(file, "\nNo caches instance.\n");
}
fflush(file); fflush(file);
} }