diff options
author | 2023-09-06 19:49:43 +0000 | |
---|---|---|
committer | 2023-09-06 19:49:43 +0000 | |
commit | 1f5b85230ab1d9ac886d29ccff8dc440242bf986 (patch) | |
tree | f29e51dab7400a5962bce73c21e90d992787876a /cmds/bootanimation/BootAnimation.cpp | |
parent | aa95ff271a31f903727c5ebc2e4990846c2073d2 (diff) | |
parent | 4dc044986487e3df8e309c7b9cce5fbe5694eed7 (diff) |
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>
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
-rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 69c161ac8c0d..f2d0efe4bb94 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -1041,7 +1041,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; } @@ -1341,7 +1341,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; @@ -1432,7 +1432,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; |