Merge "Fix warning" into mnc-dev

libs/hwui/FrameInfo.cpp

@@ -20,7 +20,7 @@
 namespace android {
 namespace uirenderer {
 
-std::string FrameInfoNames[] = {
+const std::string FrameInfoNames[] = {
     "Flags",
     "IntendedVsync",
     "Vsync",

libs/hwui/FrameInfo.h

@@ -50,7 +50,7 @@ enum class FrameInfoIndex {
     kNumIndexes
 };
 
-extern std::string FrameInfoNames[];
+extern const std::string FrameInfoNames[];
 
 enum class FrameInfoFlags {
     kWindowLayoutChanged = 1 << 0,

libs/hwui/renderthread/CanvasContext.cpp

@@ -401,7 +401,7 @@ void CanvasContext::dumpFrames(int fd) {
     FILE* file = fdopen(fd, "a");
     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, "%s", FrameInfoNames[i].c_str());
         fprintf(file, ",");
     }
     for (size_t i = 0; i < mFrames.size(); i++) {