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

Revert "Escape single quotes in aapt2"

Browse Source 
This reverts commit c90f42c80f.

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
Merged-In: I775b8a304e76a83934c36886c17cf23560914d21
(cherry picked from commit 27e9a4a85f)
This commit is contained in:
Donald Chai
2022-05-01 22:25:03 +00:00
committed by Jackal Guo
parent cfbbd755ff
commit 49956a73c1
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt2/xml/XmlDom.cpp
View File

@@ -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));

13
tools/aapt2/xml/XmlDom_test.cpp
View File

@@ -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;