diff options
author | 2023-09-06 19:49:43 +0000 | |
---|---|---|
committer | 2023-09-06 19:49:43 +0000 | |
commit | 1f5b85230ab1d9ac886d29ccff8dc440242bf986 (patch) | |
tree | f29e51dab7400a5962bce73c21e90d992787876a /tools/aapt/XMLNode.cpp | |
parent | aa95ff271a31f903727c5ebc2e4990846c2073d2 (diff) | |
parent | 4dc044986487e3df8e309c7b9cce5fbe5694eed7 (diff) |
Merge "Migrate String8|16.setTo to assignment operator" into main am: c01e3ba035 am: 1ca55b9eb9 am: 6fd58092f6 am: af3d4530d8 am: 4dc0449864
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077
Change-Id: I6ba4c4df589ed3851d1ac677b7078cac7015b6fa
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.cpp | 6 |
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; |