commit ecb965cd7c47fa5636814f92d83a20b90a4f7ee5
author Yabin Cui <yabinc@google.com> Thu Aug 05 14:15:56 2021 -0700
committer Yabin Cui <yabinc@google.com> Thu Aug 05 15:37:18 2021 -0700
tree 448944a871b0c816729e9df7c21ba1c594df423d
parent aa87e1d092f2b459ab2b1aaf179e4f5920a8dc87

Fix enum_value_name() for compiler update.

Bug: 195659713
Test: run libinput_test
Change-Id: I82c1d98bd189e60f86a26a02281c49167368e8ad

include/input/NamedEnum.h

diff --git a/include/input/NamedEnum.h b/include/input/NamedEnum.h
index 6562348..8d3f6b7 100644
--- a/include/input/NamedEnum.h
+++ b/include/input/NamedEnum.h
@@ -50,6 +50,10 @@
 
     // 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;