diff options
| author | 2023-09-13 23:04:25 +0000 | |
|---|---|---|
| committer | 2023-09-13 23:04:25 +0000 | |
| commit | 834467bdcc1a799ece112553070593bbd4940455 (patch) | |
| tree | ff090d8a29609368f294044451100befff6ce5eb /cmds/bootanimation/BootAnimation.cpp | |
| parent | 36a4442577e66659f9769c32b52315cec4a4acf6 (diff) | |
| parent | d001ea5b7242f110530e339d479b28b29dadc242 (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: Icc8df7b364fcda5e6cc734bdbef49e2d7dc43b76
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 302af7642e14..681f8e9f44a0 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -1788,7 +1788,7 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn) { fn.c_str()); return nullptr; } - ZipFileRO *zip = ZipFileRO::open(fn); + ZipFileRO *zip = ZipFileRO::open(fn.c_str()); if (zip == nullptr) { SLOGE("Failed to open animation zip \"%s\": %s", fn.c_str(), strerror(errno)); |