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

Merge "Revert "Escape single quotes in aapt2"" into tm-dev am: d63cdb916d am: d16011d658

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134683

Change-Id: I60ba278703034c5f6e6d722a66b0a0a902111043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jackal Guo
2022-05-03 16:40:22 +00:00
committed by Automerger Merge Worker
parent ef703aed4e d16011d658
commit f1439835cf
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; size_t len;
const char16_t* str16 = tree.getText(&len); const char16_t* str16 = tree.getText(&len);
if (str16) { if (str16) {
text->text = text->text = util::Utf16ToUtf8(StringPiece16(str16, len));
ResTable::normalizeForOutput(util::Utf16ToUtf8(StringPiece16(str16, len)).c_str());
} }
CHECK(!node_stack.empty()); CHECK(!node_stack.empty());
node_stack.top()->AppendChild(std::move(text)); 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("\"")); 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 { class TestVisitor : public PackageAwareVisitor {
public: public:
using PackageAwareVisitor::Visit; using PackageAwareVisitor::Visit;