Merge "Fix aapt2 JavaClassGenerator Maybe#value() call before check"

1 files changed, 5 insertions, 3 deletions

diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp
index 6c3bcf039be1..bb541fe2490b 100644
--- a/tools/aapt2/java/JavaClassGenerator.cpp
+++ b/tools/aapt2/java/JavaClassGenerator.cpp
@@ -304,9 +304,11 @@ void JavaClassGenerator::ProcessStyleable(const ResourceNameRef& name, const Res
     auto documentation_remove_iter = std::remove_if(documentation_attrs.begin(),
                                                     documentation_attrs.end(),
                                                     [&](StyleableAttr entry) -> bool {
-      StringPiece attr_comment_line = entry.symbol.value().attribute->GetComment();
-      return SkipSymbol(entry.symbol) || attr_comment_line.contains("@removed")
-                                      || attr_comment_line.contains("@hide");
+      if (SkipSymbol(entry.symbol)) {
+        return true;
+      }
+      const StringPiece attr_comment_line = entry.symbol.value().attribute->GetComment();
+      return attr_comment_line.contains("@removed") || attr_comment_line.contains("@hide");
     });
     documentation_attrs.erase(documentation_remove_iter, documentation_attrs.end());