From 27e9a4a85fe74bf13614396bb681967b53924f90 Mon Sep 17 00:00:00 2001
From: Donald Chai <dchai@google.com>
Date: Sun, 1 May 2022 22:25:03 +0000
Subject: [PATCH] Revert "Escape single quotes in aapt2"

This reverts commit c90f42c80fc9472ad1b46402672c0444b0365f49.

Reason for revert: Introduces the escaping *into the APKs*; as mentioned in b/140373430#comment3 the Right Way to dump XML is via textproto.
Fix: 222745626
Bug: 140373430

Change-Id: I775b8a304e76a83934c36886c17cf23560914d21
---
 tools/aapt2/xml/XmlDom.cpp      |  3 +--
 tools/aapt2/xml/XmlDom_test.cpp | 13 -------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp
index dd60f1717de75..8b7eadf9fac90 100644
--- a/tools/aapt2/xml/XmlDom.cpp
+++ b/tools/aapt2/xml/XmlDom.cpp
@@ -349,8 +349,7 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t len, std::string*
         size_t len;
         const char16_t* str16 = tree.getText(&len);
         if (str16) {
-          text->text =
-              ResTable::normalizeForOutput(util::Utf16ToUtf8(StringPiece16(str16, len)).c_str());
+          text->text = util::Utf16ToUtf8(StringPiece16(str16, len));
         }
         CHECK(!node_stack.empty());
         node_stack.top()->AppendChild(std::move(text));
diff --git a/tools/aapt2/xml/XmlDom_test.cpp b/tools/aapt2/xml/XmlDom_test.cpp
index 3a2d656240bb9..6c717dcd84c80 100644
--- a/tools/aapt2/xml/XmlDom_test.cpp
+++ b/tools/aapt2/xml/XmlDom_test.cpp
@@ -139,19 +139,6 @@ TEST(XmlDomTest, XmlEscapeSequencesAreParsed) {
   EXPECT_THAT(attr->value, Eq("\""));
 }
 
-TEST(XmlDomTest, XmlEscapeSingleQuotes) {
-  std::unique_ptr<XmlResource> doc = test::BuildXmlDom(R"(
-    <foo><![CDATA[oh no' (line=1001)
-E: this-is-not-an-element (line=88)
-    T: 'blah]]></foo>)");
-
-  Element* el = doc->root.get();
-  Text* text = xml::NodeCast<xml::Text>(el->children[0].get());
-  ASSERT_THAT(text, NotNull());
-  EXPECT_THAT(text->text,
-              Eq("oh no' (line=1001)\nE: this-is-not-an-element (line=88)\n    T: 'blah"));
-}
-
 class TestVisitor : public PackageAwareVisitor {
  public:
   using PackageAwareVisitor::Visit;