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 
am: d8ec9971cb

Change-Id: I0cb6c1bec55e8490681e161100ef8522aebd91e3
This commit is contained in:
Ryan Mitchell
2019-04-16 17:34:41 -07:00
committed by android-build-merger
parent 3967098ee8 d8ec9971cb
commit acbf1c7668
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; constexpr uint32_t kMask = android::ResTable_map::TYPE_ENUM | android::ResTable_map::TYPE_FLAGS;
if (attr->type_mask & kMask) { if (attr->type_mask & kMask) {
for (const auto& symbol : attr->symbols) { for (const auto& symbol : attr->symbols) {
printer_->Print(symbol.symbol.name.value().entry); if (symbol.symbol.name) {
if (symbol.symbol.id) { printer_->Print(symbol.symbol.name.value().entry);
printer_->Print("(");
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(symbol.symbol.id.value().to_string());
printer_->Print(")"); } else {
printer_->Print("???");
} }
printer_->Println(StringPrintf("=0x%08x", symbol.value)); printer_->Println(StringPrintf("=0x%08x", symbol.value));
} }
} }