Merge "Check value in dump before printing" into qt-dev (d8ec9971) · Commits · e / os / android_frameworks_base

tools/aapt2/Debug.cpp

+12 −4

Original line number	Diff line number	Diff line
		@@ -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) {
		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());
		} else {
		printer_->Print("???");
		}

		printer_->Println(StringPrintf("=0x%08x", symbol.value));
		}
		}