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>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 647790b01bfa..3a198fd43d48 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -781,7 +781,7 @@ static void fullyQualifyClassName(const String8& package, const sp<XMLNode>& nod
         if (kIsDebug) {
             printf("Qualifying class '%s' to '%s'", name.c_str(), className.c_str());
         }
-        attr->string.setTo(String16(className));
+        attr->string = String16(className);
     }
 }
 
@@ -971,7 +971,7 @@ status_t massageManifest(Bundle* bundle, ResourceTable* table, sp<XMLNode> root)
             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);
@@ -1009,7 +1009,7 @@ status_t massageManifest(Bundle* bundle, ResourceTable* table, sp<XMLNode> root)
                 XMLNode::attribute_entry* attr = child->editAttribute(
                         String16(RESOURCES_ANDROID_NAMESPACE), String16("targetPackage"));
                 if (attr != NULL) {
-                    attr->string.setTo(String16(instrumentationPackageNameOverride));
+                    attr->string = String16(instrumentationPackageNameOverride);
                 }
             }
         }