diff options
| author | 2023-09-13 23:55:12 +0000 | |
|---|---|---|
| committer | 2023-09-13 23:55:12 +0000 | |
| commit | de14ea1930186dcc0334159c4be56456d22ae244 (patch) | |
| tree | 219383dfce845a000e8fac4d64f5b1b7af54c169 /cmds/bootanimation/BootAnimation.cpp | |
| parent | f00f64df02c30f55542231090afce5ca2fe9e232 (diff) | |
| parent | 834467bdcc1a799ece112553070593bbd4940455 (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72 am: 834467bdcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: I9700ffc0fab78bf6dfc737433d0247abbcf8bf19
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)); |