resolve merge conflicts of 815fb834e5b1fce48f92542dcf812549c85e403b to sc-v2-dev-plus-aosp
Change-Id: I7475d6a219ec1613543003712ca4d87567fc2ed5
diff --git a/include/ftl/NamedEnum.h b/include/ftl/NamedEnum.h
index f50ff46..6e98fee 100644
--- a/include/ftl/NamedEnum.h
+++ b/include/ftl/NamedEnum.h
@@ -49,6 +49,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;