commit 6cf4234405f2cea78cff34ec43ba8808253655b6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 31 03:42:07 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 31 03:42:07 2022 +0000
tree 67df8c089fe1efd9c7b8ade6361cbc9b9bf015c6
parent 345b544e657307103d93bcd80ecbbf02b877090f
parent a1da277369dac12421d730cf1c551275f2072489

Merge "Fix aapt2 dump xmltree not escape text nodes"

tools/aapt2/Debug.cpp

diff --git a/tools/aapt2/Debug.cpp b/tools/aapt2/Debug.cpp
index dfa2291..f9e52b4 100644
--- a/tools/aapt2/Debug.cpp
+++ b/tools/aapt2/Debug.cpp
@@ -33,6 +33,7 @@
 #include "ValueVisitor.h"
 #include "android-base/logging.h"
 #include "android-base/stringprintf.h"
+#include "androidfw/ResourceTypes.h"
 #include "idmap2/Policies.h"
 #include "text/Printer.h"
 #include "util/Util.h"
@@ -515,7 +516,8 @@
   }
 
   void Visit(const xml::Text* text) override {
-    printer_->Println(StringPrintf("T: '%s'", text->text.c_str()));
+    printer_->Println(
+        StringPrintf("T: '%s'", android::ResTable::normalizeForOutput(text->text.c_str()).c_str()));
   }
 
  private: