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

Commit 7d755401 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change NamedEnum unknow enum string format from hexical to decimal."

parents 3548159e 749b8465

include/input/NamedEnum.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public: 
    // Do not specialize it to a large number to avoid performance issues.

    // The recommended maximum enum number to specialize is 64.

    template <typename E>

    static const std::string string(E val, const char* fallbackFormat = "0x%08x") {

    static const std::string string(E val, const char* fallbackFormat = "%02d") {

        std::string result;

        std::optional<std::string_view> enumString = enum_name(val);

        result += enumString ? enumString.value() : base::StringPrintf(fallbackFormat, val);

libs/input/tests/NamedEnum_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ TEST(NamedEnum, RuntimeUnknownNamedEnum) { 


TEST(NamedEnum, RuntimeUnknownNamedEnumAsString) {

    TestEnums e = static_cast<TestEnums>(0x5);

    ASSERT_EQ(NamedEnum::string(e), "0x00000005");

    ASSERT_EQ(NamedEnum::string(e), "05");

    e = static_cast<TestEnums>(0x9);

    ASSERT_EQ(NamedEnum::string(e), "0x00000009");

    ASSERT_EQ(NamedEnum::string(e, "0x%08x"), "0x00000009");

}



TEST(NamedEnum, CompileTimeFlagName) {