Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-09 19:47:59 +00:00
committed by Android (Google) Code Review
parent ec10f333b5 4e19c48a6e
commit 995fbdb659
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt2/java/JavaClassGenerator.cpp
View File

@@ -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());