diff options
author | 2023-09-06 16:40:21 +0000 | |
---|---|---|
committer | 2023-09-06 16:40:21 +0000 | |
commit | 1ca55b9eb9a7772e183fbb93c0a29edea3cd4a66 (patch) | |
tree | 2e3302f0eac9bc7f01e0146571a42f69770fdd2f /tools/aapt/Resource.cpp | |
parent | 0cfc1c6dddcc94b931a88c741eb99848b7741a6d (diff) | |
parent | c01e3ba0358b8c9b442c76a6758e4a9b712ae32f (diff) |
Merge "Migrate String8|16.setTo to assignment operator" into main am: c01e3ba035
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077
Change-Id: I4b4032ff4145ac6aa328723dd73151e1e7a021a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r-- | tools/aapt/Resource.cpp | 6 |
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); } } } |