Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix warning" into mnc-dev

Browse Source
This commit is contained in:
John Reck
2015-06-03 17:16:46 +00:00
committed by Android (Google) Code Review
parent 310fe5af67 2a8bb05a31
commit 2794a79832
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/FrameInfo.cpp
View File

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

2
libs/hwui/FrameInfo.h
View File

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

2
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -401,7 +401,7 @@ void CanvasContext::dumpFrames(int fd) {
FILE* file = fdopen(fd, "a"); FILE* file = fdopen(fd, "a");
fprintf(file, "\n\n---PROFILEDATA---\n"); fprintf(file, "\n\n---PROFILEDATA---\n");
for (size_t i = 0; i < static_cast<size_t>(FrameInfoIndex::kNumIndexes); i++) { 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, ","); fprintf(file, ",");
} }
for (size_t i = 0; i < mFrames.size(); i++) { for (size_t i = 0; i < mFrames.size(); i++) {