commit 2a8bb05a31ddd0d44d8513cba9fbd9b4ef9b97f6
author John Reck <jreck@google.com> Wed Jun 03 09:52:01 2015 -0700
committer John Reck <jreck@google.com> Wed Jun 03 09:53:42 2015 -0700
tree 08f15a4f926c173615a8220201d5bbdf1d1d0c6c
parent e7f68c18bf1a1da5d0aa129674fe4f9ecf06ac8c

Fix warning

Bug: 21608208
Change-Id: I1d1cf1fbc8c0a4561bf76e307c56be580fb4baef

libs/hwui/FrameInfo.cpp

diff --git a/libs/hwui/FrameInfo.cpp b/libs/hwui/FrameInfo.cpp
index c24833b..85998f1 100644
--- a/libs/hwui/FrameInfo.cpp
+++ b/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

diff --git a/libs/hwui/FrameInfo.h b/libs/hwui/FrameInfo.h
index bcfae1b..38a6a21 100644
--- a/libs/hwui/FrameInfo.h
+++ b/libs/hwui/FrameInfo.h
@@ -50,7 +50,7 @@
     kNumIndexes
 };
 
-extern std::string FrameInfoNames[];
+extern const std::string FrameInfoNames[];
 
 enum class FrameInfoFlags {
     kWindowLayoutChanged = 1 << 0,

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index f8490b6..acf9c13 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -401,7 +401,7 @@
     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++) {