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

Commit 34a9a1e8 authored by Yabin Cui's avatar Yabin Cui
Browse files

resolve merge conflicts of 815fb834 to sc-v2-dev-plus-aosp

Change-Id: I7475d6a219ec1613543003712ca4d87567fc2ed5
parents 764e1d48 815fb834
Loading
Loading
Loading
Loading
+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;