Migrate String8|16.setTo to assignment operator
Bug: 295394788
Test: make checkbuild
Change-Id: I6e9ea0d73b5ad7321d486b0dbcbfe29b9dbeb088
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 2b1f453..989b127 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -834,7 +834,7 @@
case 'd':
{
dumpStream = true;
- dumpStreamFilename.setTo(optarg);
+ dumpStreamFilename = optarg;
break;
}
@@ -842,13 +842,13 @@
{
dumpPCMStream = true;
audioOnly = true;
- dumpStreamFilename.setTo(optarg);
+ dumpStreamFilename = optarg;
break;
}
case 'N':
{
- gComponentNameOverride.setTo(optarg);
+ gComponentNameOverride = optarg;
break;
}
@@ -886,7 +886,7 @@
case 'w':
{
gWriteMP4 = true;
- gWriteMP4Filename.setTo(optarg);
+ gWriteMP4Filename = optarg;
break;
}
diff --git a/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp b/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
index ad015bf..a54ae47 100644
--- a/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
+++ b/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
@@ -128,7 +128,7 @@
if (nextToken + 1 == mTokens.end())
break;
valueToken = (*(nextToken + 1)).c_str();
- value->setTo(valueToken);
+ *value = valueToken;
nextToken++;
break;
}
@@ -172,7 +172,7 @@
pjs = jsonObject.c_str() + mJsmnTokens[j].start;
if (mJsmnTokens[j].type == JSMN_STRING ||
mJsmnTokens[j].type == JSMN_PRIMITIVE) {
- token.setTo(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
+ token = String8(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
tokens->add(token);
ALOGV("add token: %s", token.c_str());
}
@@ -221,7 +221,7 @@
for (int i = 0; i < numTokens; ++i) {
pjs = jsonAsset.c_str() + mJsmnTokens[i].start;
if (mJsmnTokens[i].type == JSMN_OBJECT) {
- token.setTo(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
+ token = String8(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
jsonObjects->add(token);
}
}
diff --git a/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp b/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
index 6f87f9d..a12b1d1 100644
--- a/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
+++ b/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
@@ -160,7 +160,7 @@
if (nextToken + 1 == mTokens.end())
break;
valueToken = (*(nextToken + 1)).c_str();
- value->setTo(valueToken);
+ *value = valueToken;
nextToken++;
break;
}
@@ -211,7 +211,7 @@
pjs = jsonObject.c_str() + mJsmnTokens[j].start;
if (mJsmnTokens[j].type == JSMN_STRING ||
mJsmnTokens[j].type == JSMN_PRIMITIVE) {
- token.setTo(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
+ token = String8(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
tokens->add(token);
}
}
@@ -259,7 +259,7 @@
for (int i = 0; i < numTokens; ++i) {
pjs = jsonWebKeySet.c_str() + mJsmnTokens[i].start;
if (mJsmnTokens[i].type == JSMN_OBJECT) {
- token.setTo(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
+ token = String8(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
jsonObjects->add(token);
}
}
diff --git a/media/libaudiohal/impl/CoreConversionHelperHidl.cpp b/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
index bd18902..b801187 100644
--- a/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
+++ b/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
@@ -97,7 +97,7 @@
for (size_t i = 0; i < parameters.size(); ++i) {
params.add(String8(parameters[i].key.c_str()), String8(parameters[i].value.c_str()));
}
- values->setTo(params.toString());
+ *values = params.toString();
}
CoreConversionHelperHidl::CoreConversionHelperHidl(std::string_view className)
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 1dfd53d..a9e5a83 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -531,7 +531,7 @@
--i;
}
- s->setTo(String8(&data[leading_space], i - leading_space));
+ *s = String8(&data[leading_space], i - leading_space);
}
status_t StagefrightRecorder::setParamAudioSamplingRate(int32_t sampleRate) {
@@ -825,7 +825,7 @@
status_t StagefrightRecorder::setParamRtpLocalIp(const String8 &localIp) {
ALOGV("setParamVideoLocalIp: %s", localIp.c_str());
- mLocalIp.setTo(localIp.c_str());
+ mLocalIp = localIp.c_str();
return OK;
}
@@ -839,7 +839,7 @@
status_t StagefrightRecorder::setParamRtpRemoteIp(const String8 &remoteIp) {
ALOGV("setParamVideoRemoteIp: %s", remoteIp.c_str());
- mRemoteIp.setTo(remoteIp.c_str());
+ mRemoteIp = remoteIp.c_str();
return OK;
}
@@ -932,7 +932,7 @@
ALOGV("setLogSessionId: %s", log_session_id.c_str());
// TODO: validity check that log_session_id is a 32-byte hex digit.
- mLogSessionId.setTo(log_session_id.c_str());
+ mLogSessionId = log_session_id.c_str();
return OK;
}
@@ -1137,9 +1137,9 @@
const char *semicolon_pos = strchr(value_start, ';');
String8 value;
if (semicolon_pos == NULL) {
- value.setTo(value_start);
+ value = value_start;
} else {
- value.setTo(value_start, semicolon_pos - value_start);
+ value = String8(value_start, semicolon_pos - value_start);
}
if (setParameter(key, value) != OK) {
return BAD_VALUE;
diff --git a/media/libmediaplayerservice/nuplayer/RTPSource.cpp b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
index efe1a80..9a33120 100644
--- a/media/libmediaplayerservice/nuplayer/RTPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
@@ -751,9 +751,9 @@
const char *semicolon_pos = strchr(value_start, ';');
String8 value;
if (semicolon_pos == NULL) {
- value.setTo(value_start);
+ value = value_start;
} else {
- value.setTo(value_start, semicolon_pos - value_start);
+ value = String8(value_start, semicolon_pos - value_start);
}
if (setParameter(key, value) != OK) {
return BAD_VALUE;
@@ -796,7 +796,7 @@
--i;
}
- s->setTo(String8(&data[leading_space], i - leading_space));
+ *s = String8(&data[leading_space], i - leading_space);
}
} // namespace android