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

Merge "Check value in dump before printing" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 22:06:24 +00:00
committed by Android (Google) Code Review
parent cb86e128cf 0c0cedff00
commit d8ec9971cb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/aapt2/Debug.cpp
View File

@@ -129,12 +129,20 @@ class ValueBodyPrinter : public ConstValueVisitor {
constexpr uint32_t kMask = android::ResTable_map::TYPE_ENUM | android::ResTable_map::TYPE_FLAGS;
if (attr->type_mask & kMask) {
for (const auto& symbol : attr->symbols) {
printer_->Print(symbol.symbol.name.value().entry);
if (symbol.symbol.id) {
printer_->Print("(");
if (symbol.symbol.name) {
printer_->Print(symbol.symbol.name.value().entry);
if (symbol.symbol.id) {
printer_->Print("(");
printer_->Print(symbol.symbol.id.value().to_string());
printer_->Print(")");
}
} else if (symbol.symbol.id) {
printer_->Print(symbol.symbol.id.value().to_string());
printer_->Print(")");
} else {
printer_->Print("???");
}
printer_->Println(StringPrintf("=0x%08x", symbol.value));
}
}