Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09e51cbe authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Migrate from android::String path functions to std::filesystem" into... 

Merge "Migrate from android::String path functions to std::filesystem" into main am: e27e15d3 am: 51858976 am: b0f9564c am: e57b90e8 am: c9a386e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2721506



Change-Id: If0df1da5708bd340dfe1fc505bef53f2a51592fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 482ddf2a c9a386e0

cmds/bootanimation/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -74,4 +74,7 @@ cc_library_shared { 
        "libGLESv2",

        "libgui",

    ],

    whole_static_libs: [

        "libc++fs",

    ],

}

cmds/bootanimation/BootAnimation.cpp

+7 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "BootAnimation"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <filesystem>

#include <vector>



#include <stdint.h>
@@ -1306,10 +1307,10 @@ bool BootAnimation::preloadZip(Animation& animation) { 
            continue;

        }



        const String8 entryName(name);

        const String8 path(entryName.getPathDir());

        const String8 leaf(entryName.getPathLeaf());

        if (leaf.size() > 0) {

        const std::filesystem::path entryName(name);

        const std::filesystem::path path(entryName.parent_path());

        const std::filesystem::path leaf(entryName.filename());

        if (!leaf.empty()) {

            if (entryName == CLOCK_FONT_ZIP_NAME) {

                FileMap* map = zip->createEntryFileMap(entry);

                if (map) {
@@ -1327,7 +1328,7 @@ bool BootAnimation::preloadZip(Animation& animation) { 
            }



            for (size_t j = 0; j < pcount; j++) {

                if (path == animation.parts[j].path) {

                if (path.string() == animation.parts[j].path.c_str()) {

                    uint16_t method;

                    // supports only stored png files

                    if (zip->getEntryInfo(entry, &method, nullptr, nullptr, nullptr, nullptr, nullptr)) {
@@ -1344,7 +1345,7 @@ bool BootAnimation::preloadZip(Animation& animation) { 
                                                        map->getDataLength());

                                } else {

                                    Animation::Frame frame;

                                    frame.name = leaf;

                                    frame.name = leaf.c_str();

                                    frame.map = map;

                                    frame.trimWidth = animation.width;

                                    frame.trimHeight = animation.height;