diff options
| author | 2023-09-14 00:44:57 +0000 | |
|---|---|---|
| committer | 2023-09-14 00:44:57 +0000 | |
| commit | ac345f8500664c51173eb7447b78846a89499c22 (patch) | |
| tree | 312e713e869ffa47c5e88c2fdcb5191d41808dfb /cmds/bootanimation/BootAnimation.cpp | |
| parent | 6905298aea9a4a52e1ac2e857031e789e51a7dac (diff) | |
| parent | 7a976b65fe2cdbe19620d12ce16839ea7e663955 (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72 am: 834467bdcc am: de14ea1930 am: 7a976b65fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: Id23e30ebeec4ddefc589a208bf5925cb2fa1816c
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 f2d0efe4bb94..89776dba7878 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -1834,7 +1834,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)); |