Migrate String8|16.setTo to assignment operator
Bug: 295394788
Test: make checkbuild
Change-Id: I370f66c469de73064dec2e42c539dc236dd69d1e
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index a040b57..4e41f2c 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -271,9 +271,9 @@
} else if (strcmp(arg, "--application") == 0) {
application = true;
} else if (strncmp(arg, "--nice-name=", 12) == 0) {
- niceName.setTo(arg + 12);
+ niceName = (arg + 12);
} else if (strncmp(arg, "--", 2) != 0) {
- className.setTo(arg);
+ className = arg;
break;
} else {
--i;
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 4690f33..fadf82a 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -1012,7 +1012,7 @@
return false;
}
- outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength());
+ outString = String8((char const*)entryMap->getDataPtr(), entryMap->getDataLength());
delete entryMap;
return true;
}
@@ -1306,7 +1306,7 @@
part.audioData = (uint8_t *)map->getDataPtr();
part.audioLength = map->getDataLength();
} else if (leaf == "trim.txt") {
- part.trimData.setTo((char const*)map->getDataPtr(),
+ part.trimData = String8((char const*)map->getDataPtr(),
map->getDataLength());
} else {
Animation::Frame frame;
@@ -1396,7 +1396,7 @@
if (!exts) {
glGetError();
} else {
- gl_extensions.setTo(exts);
+ gl_extensions = exts;
if ((gl_extensions.find("GL_ARB_texture_non_power_of_two") != -1) ||
(gl_extensions.find("GL_OES_texture_npot") != -1)) {
mUseNpotTextures = true;
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp
index 60da2c2..c0e9215 100644
--- a/core/jni/android_database_CursorWindow.cpp
+++ b/core/jni/android_database_CursorWindow.cpp
@@ -89,7 +89,7 @@
CursorWindow* window;
const char* nameStr = env->GetStringUTFChars(nameObj, NULL);
- name.setTo(nameStr);
+ name = nameStr;
env->ReleaseStringUTFChars(nameObj, nameStr);
if (cursorWindowSize < 0) {
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 0e7d841..cc38062 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -6190,13 +6190,13 @@
if (append) {
outString->append(tmp);
} else {
- outString->setTo(tmp);
+ *outString = tmp;
}
} else {
if (append) {
outString->append(String16(s, len));
} else {
- outString->setTo(s, len);
+ *outString = String16(s, len);
}
}
@@ -7398,10 +7398,10 @@
*pOverlayCrc = dtohl(map[3]);
}
if (pTargetPath) {
- pTargetPath->setTo(reinterpret_cast<const char*>(map + 4));
+ *pTargetPath = reinterpret_cast<const char*>(map + 4);
}
if (pOverlayPath) {
- pOverlayPath->setTo(reinterpret_cast<const char*>(map + 4 + 256 / sizeof(uint32_t)));
+ *pOverlayPath = reinterpret_cast<const char*>(map + 4 + 256 / sizeof(uint32_t));
}
return true;
}
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index 7092e17..208dc3e 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -121,9 +121,9 @@
if (name) {
const char* lastPeriod = strrchr(name, '.');
if (lastPeriod) {
- mName.setTo(lastPeriod + 1);
+ mName = (lastPeriod + 1);
} else {
- mName.setTo(name);
+ mName = name;
}
}
}
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 4a360ed..c5cbd51 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -779,7 +779,7 @@
if (kIsDebug) {
printf("Qualifying class '%s' to '%s'", name.c_str(), className.c_str());
}
- attr->string.setTo(String16(className));
+ attr->string = String16(className);
}
}
@@ -969,7 +969,7 @@
return UNKNOWN_ERROR;
}
String8 origPackage(attr->string);
- attr->string.setTo(String16(manifestPackageNameOverride));
+ attr->string = String16(manifestPackageNameOverride);
if (kIsDebug) {
printf("Overriding package '%s' to be '%s'\n", origPackage.c_str(),
manifestPackageNameOverride);
@@ -1007,7 +1007,7 @@
XMLNode::attribute_entry* attr = child->editAttribute(
String16(RESOURCES_ANDROID_NAMESPACE), String16("targetPackage"));
if (attr != NULL) {
- attr->string.setTo(String16(instrumentationPackageNameOverride));
+ attr->string = String16(instrumentationPackageNameOverride);
}
}
}
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index bccf73e..b54b1e1 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -1363,11 +1363,11 @@
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));
}
}
@@ -1541,7 +1541,7 @@
} else {
ssize_t sep = ident.findLast('.');
if (sep >= 0) {
- parentIdent.setTo(ident, sep);
+ parentIdent = String16(ident, sep);
}
}
@@ -2831,10 +2831,10 @@
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)) {
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index e270a73..a887ac9 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -334,9 +334,9 @@
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 @@
// 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;
diff --git a/tools/split-select/Main.cpp b/tools/split-select/Main.cpp
index 1e75117..73bfa19 100644
--- a/tools/split-select/Main.cpp
+++ b/tools/split-select/Main.cpp
@@ -257,7 +257,7 @@
usage();
return 1;
}
- targetConfigStr.setTo(*argv);
+ targetConfigStr = *argv;
} else if (arg == "--split") {
argc--;
argv++;
@@ -281,7 +281,7 @@
usage();
return 1;
}
- baseApkPath.setTo(*argv);
+ baseApkPath = *argv;
} else if (arg == "--generate") {
generateFlag = true;
} else if (arg == "--help") {
diff --git a/tools/split-select/SplitDescription.cpp b/tools/split-select/SplitDescription.cpp
index 7150008..c02e2d7 100644
--- a/tools/split-select/SplitDescription.cpp
+++ b/tools/split-select/SplitDescription.cpp
@@ -134,10 +134,10 @@
String8 configStr;
String8 extensionStr;
if (index >= 0) {
- configStr.setTo(str.c_str(), index);
- extensionStr.setTo(str.c_str() + index + 1);
+ configStr = String8(str.c_str(), index);
+ extensionStr = (str.c_str() + index + 1);
} else {
- configStr.setTo(str);
+ configStr = str;
}
SplitDescription split;
