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

Commit e7994f03 authored by Yabin Cui's avatar Yabin Cui Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 815fb834 to... 

resolve merge conflicts of 815fb834 to sc-v2-dev-plus-aosp am: 34a9a1e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15475022

Change-Id: Iec8c046fa2ba1b2fcbd5a12ef066b3d8f7a6e563
parents 45d7974f 34a9a1e8

include/ftl/NamedEnum.h

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ constexpr std::optional<std::string_view> enum_value_name() { 


    // Example (cont'd): V = android::test::TestEnums::ONE

    view = view.substr(valStart);

    // Check invalid enum values with cast, like V = (android::test::TestEnums)8.

    if (view.find('(') != std::string::npos) {

        return std::nullopt;

    }

    size_t nameStart = view.rfind("::");

    if (nameStart == std::string::npos) {

        return std::nullopt;