Merge "FrameInfo header fixes" into mnc-dev

libs/hwui/FrameInfo.cpp

@@ -20,6 +20,22 @@
 namespace android {
 namespace uirenderer {
 
+std::string FrameInfoNames[] = {
+    "Flags",
+    "IntendedVsync",
+    "Vsync",
+    "OldestInputEvent",
+    "NewestInputEvent",
+    "HandleInputStart",
+    "AnimationStart",
+    "PerformTraversalsStart",
+    "DrawStart",
+    "SyncStart",
+    "IssueDrawCommandsStart",
+    "SwapBuffers",
+    "FrameCompleted",
+};
+
 void FrameInfo::importUiThreadInfo(int64_t* info) {
     memcpy(mFrameInfo, info, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t));
 }

libs/hwui/FrameInfo.h

@@ -22,6 +22,7 @@
 #include <utils/Timers.h>
 
 #include <memory.h>
+#include <string>
 
 namespace android {
 namespace uirenderer {
@@ -49,6 +50,8 @@ enum class FrameInfoIndex {
     kNumIndexes
 };
 
+extern std::string FrameInfoNames[];
+
 enum class FrameInfoFlags {
     kWindowLayoutChanged = 1 << 0,
     kRTAnimation = 1 << 1,

libs/hwui/renderthread/CanvasContext.cpp

@@ -391,7 +391,11 @@ void CanvasContext::setTextureAtlas(RenderThread& thread,
 
 void CanvasContext::dumpFrames(int fd) {
     FILE* file = fdopen(fd, "a");
-    fprintf(file, "\n\n---PROFILEDATA---");
+    fprintf(file, "\n\n---PROFILEDATA---\n");
+    for (size_t i = 0; i < static_cast<size_t>(FrameInfoIndex::kNumIndexes); i++) {
+        fprintf(file, FrameInfoNames[i].c_str());
+        fprintf(file, ",");
+    }
     for (size_t i = 0; i < mFrames.size(); i++) {
         FrameInfo& frame = mFrames[i];
         if (frame[FrameInfoIndex::kSyncStart] == 0) {