Migrate String8|16.setTo to assignment operator

Bug: 295394788 Test: make checkbuild Change-Id: I6e9ea0d73b5ad7321d486b0dbcbfe29b9dbeb088
pa-faiz · Aug 23, 2023 · aebf8fe · aebf8fe
1 parent 0188ed1
commit aebf8fe
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
@@ -834,21 +834,21 @@ int main(int argc, char **argv) {
             case 'd':
             {
                 dumpStream = true;
-                dumpStreamFilename.setTo(optarg);
+                dumpStreamFilename = optarg;
                 break;
             }
 
             case 'D':
             {
                 dumpPCMStream = true;
                 audioOnly = true;
-                dumpStreamFilename.setTo(optarg);
+                dumpStreamFilename = optarg;
                 break;
             }
 
             case 'N':
             {
-                gComponentNameOverride.setTo(optarg);
+                gComponentNameOverride = optarg;
                 break;
             }
 
@@ -886,7 +886,7 @@ int main(int argc, char **argv) {
             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
@@ -128,7 +128,7 @@ void JsonAssetLoader::findValue(const String8 &key, String8* value) {
             if (nextToken + 1 == mTokens.end())
                 break;
             valueToken = (*(nextToken + 1)).c_str();
-            value->setTo(valueToken);
+            *value = valueToken;
             nextToken++;
             break;
         }
@@ -172,7 +172,7 @@ bool JsonAssetLoader::parseJsonObject(const String8& jsonObject,
         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 @@ bool JsonAssetLoader::parseJsonAssetString(const String8& jsonAsset,
     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
@@ -160,7 +160,7 @@ void JsonWebKey::findValue(const String8 &key, String8* value) {
             if (nextToken + 1 == mTokens.end())
                 break;
             valueToken = (*(nextToken + 1)).c_str();
-            value->setTo(valueToken);
+            *value = valueToken;
             nextToken++;
             break;
         }
@@ -211,7 +211,7 @@ bool JsonWebKey::parseJsonObject(const String8& jsonObject,
         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 @@ bool JsonWebKey::parseJsonWebKeySet(const String8& jsonWebKeySet,
     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
@@ -97,7 +97,7 @@ void CoreConversionHelperHidl::parametersToHal(
     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
@@ -531,7 +531,7 @@ static void TrimString(String8 *s) {
         --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::setParamGeoDataLatitude(
 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::setParamRtpLocalPort(int32_t localPort) {
 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 @@ status_t StagefrightRecorder::setLogSessionId(const String8 &log_session_id) {
     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 @@ status_t StagefrightRecorder::setParameters(const String8 &params) {
         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
@@ -751,9 +751,9 @@ status_t NuPlayer::RTPSource::setParameters(const String8 &params) {
         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 @@ void NuPlayer::RTPSource::TrimString(String8 *s) {
         --i;
     }
 
-    s->setTo(String8(&data[leading_space], i - leading_space));
+    *s = String8(&data[leading_space], i - leading_space);
 }
 
 }  // namespace android