diff options
author | 2023-09-13 22:08:53 +0000 | |
---|---|---|
committer | 2023-09-13 22:08:53 +0000 | |
commit | d001ea5b7242f110530e339d479b28b29dadc242 (patch) | |
tree | 461583516b23b03f09774f48e416790fed432551 /cmds/bootanimation/BootAnimation.cpp | |
parent | 20bb26382d5244b979baa8a6d9a42cc92f208d5b (diff) | |
parent | 41363ba9fceec76e0233db8889d75e986b91f39a (diff) |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: I0ad1370690eb3763c4d2a7a361bc91f22fd15919
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)); |