summaryrefslogtreecommitdiff
path: root/tools/aapt/XMLNode.cpp
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-09-06 18:54:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 18:54:36 +0000
commit4dc044986487e3df8e309c7b9cce5fbe5694eed7 (patch)
treeccff814da135202ae0fbebe005a82a827f5c37e5 /tools/aapt/XMLNode.cpp
parent4fb86ec92a08a65e2ab52f8e361edb15b380cfc4 (diff)
parentaf3d4530d8b6b833fb071ee35078170104b7d9ce (diff)
Merge "Migrate String8|16.setTo to assignment operator" into main am: c01e3ba035 am: 1ca55b9eb9 am: 6fd58092f6 am: af3d4530d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077 Change-Id: I23209be097511bfb4f4f6236ffad072833cb6a45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/XMLNode.cpp')
-rw-r--r--tools/aapt/XMLNode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index e270a7333295..a887ac947835 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -334,9 +334,9 @@ moveon:
String16 spanTag;
ssize_t semi = span.name.findFirst(';');
if (semi >= 0) {
- spanTag.setTo(span.name.c_str(), semi);
+ spanTag = String16(span.name.c_str(), semi);
} else {
- spanTag.setTo(span.name);
+ spanTag = span.name;
}
if (strcmp16(inXml->getElementName(&len), spanTag.c_str()) != 0) {
SourcePos(String8(fileName), inXml->getLineNumber()).error(
@@ -393,7 +393,7 @@ moveon:
// later as part of the overall type conversion. Return to the
// client the raw unprocessed text.
rawString.append(curString);
- outString->setTo(rawString);
+ *outString = rawString;
}
return NO_ERROR;