Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2794a798 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix warning" into mnc-dev

parents 310fe5af 2a8bb05a

libs/hwui/FrameInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
namespace android {

namespace uirenderer {



std::string FrameInfoNames[] = {

const std::string FrameInfoNames[] = {

    "Flags",

    "IntendedVsync",

    "Vsync",

libs/hwui/FrameInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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++) {