summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-09-06 19:49:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 19:49:43 +0000
commit1f5b85230ab1d9ac886d29ccff8dc440242bf986 (patch)
treef29e51dab7400a5962bce73c21e90d992787876a /tools/aapt/ResourceTable.cpp
parentaa95ff271a31f903727c5ebc2e4990846c2073d2 (diff)
parent4dc044986487e3df8e309c7b9cce5fbe5694eed7 (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/ResourceTable.cpp')
-rw-r--r--tools/aapt/ResourceTable.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 2df9d63b8e99..9fb731948b32 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -1364,11 +1364,11 @@ status_t compileResourceFile(Bundle* bundle,
size_t length;
const char16_t* attr = block.getAttributeName(i, &length);
if (strcmp16(attr, name16.c_str()) == 0) {
- name.setTo(block.getAttributeStringValue(i, &length));
+ name = String16(block.getAttributeStringValue(i, &length));
} else if (strcmp16(attr, translatable16.c_str()) == 0) {
- translatable.setTo(block.getAttributeStringValue(i, &length));
+ translatable = String16(block.getAttributeStringValue(i, &length));
} else if (strcmp16(attr, formatted16.c_str()) == 0) {
- formatted.setTo(block.getAttributeStringValue(i, &length));
+ formatted = String16(block.getAttributeStringValue(i, &length));
}
}
@@ -1542,7 +1542,7 @@ status_t compileResourceFile(Bundle* bundle,
} else {
ssize_t sep = ident.findLast('.');
if (sep >= 0) {
- parentIdent.setTo(ident, sep);
+ parentIdent = String16(ident, sep);
}
}
@@ -2832,10 +2832,10 @@ ResourceTable::validateLocalizations(void)
String8 config;
comma = strchr(start, ',');
if (comma != NULL) {
- config.setTo(start, comma - start);
+ config = String8(start, comma - start);
start = comma + 1;
} else {
- config.setTo(start);
+ config = start;
}
if (!locale.initFromFilterString(config)) {