summaryrefslogtreecommitdiff
path: root/tools/aapt/XMLNode.cpp
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-09-06 16:40:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 16:40:21 +0000
commit1ca55b9eb9a7772e183fbb93c0a29edea3cd4a66 (patch)
tree2e3302f0eac9bc7f01e0146571a42f69770fdd2f /tools/aapt/XMLNode.cpp
parent0cfc1c6dddcc94b931a88c741eb99848b7741a6d (diff)
parentc01e3ba0358b8c9b442c76a6758e4a9b712ae32f (diff)
Merge "Migrate String8|16.setTo to assignment operator" into main am: c01e3ba035
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077 Change-Id: I4b4032ff4145ac6aa328723dd73151e1e7a021a5 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;