diff options
| author | 2023-09-14 00:32:42 +0000 | |
|---|---|---|
| committer | 2023-09-14 00:32:42 +0000 | |
| commit | 7a976b65fe2cdbe19620d12ce16839ea7e663955 (patch) | |
| tree | 0ed79fb2ce1c76d378c84373accdc2bedd145e82 /cmds/bootanimation/BootAnimation.cpp | |
| parent | a03b1b67fc6f702131cf2112781c4ea820866744 (diff) | |
| parent | de14ea1930186dcc0334159c4be56456d22ae244 (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72 am: 834467bdcc am: de14ea1930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: I525be5e00332c07509dd24907d5a7581dff46be6
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)); |