summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-09-06 16:40:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 16:40:21 +0000
commit1ca55b9eb9a7772e183fbb93c0a29edea3cd4a66 (patch)
tree2e3302f0eac9bc7f01e0146571a42f69770fdd2f /cmds/bootanimation/BootAnimation.cpp
parent0cfc1c6dddcc94b931a88c741eb99848b7741a6d (diff)
parentc01e3ba0358b8c9b442c76a6758e4a9b712ae32f (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 'cmds/bootanimation/BootAnimation.cpp')
-rw-r--r--cmds/bootanimation/BootAnimation.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 2047f1867c31..302af7642e14 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -1010,7 +1010,7 @@ static bool readFile(ZipFileRO* zip, const char* name, String8& outString) {
return false;
}
- outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength());
+ outString = String8((char const*)entryMap->getDataPtr(), entryMap->getDataLength());
delete entryMap;
return true;
}
@@ -1304,7 +1304,7 @@ bool BootAnimation::preloadZip(Animation& animation) {
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;
@@ -1394,7 +1394,7 @@ bool BootAnimation::movie() {
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;