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

Commit bd4c482b authored by Yusuke Sato's avatar Yusuke Sato Committed by Gerrit Code Review
Browse files

Merge "Clean up AssetManager::scanAndMergeZipLocked"

parents a024acb8 05f648e1

libs/androidfw/AssetManager.cpp

+2 −4
Original line number Diff line number Diff line
@@ -1545,7 +1545,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg 
     */

    int dirNameLen = dirName.length();

    void *iterationCookie;

    if (!pZip->startIteration(&iterationCookie)) {

    if (!pZip->startIteration(&iterationCookie, dirName.string(), NULL)) {

        ALOGW("ZipFileRO::startIteration returned false");

        return false;

    }
@@ -1560,9 +1560,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg 
            continue;

        }

        //printf("Comparing %s in %s?\n", nameBuf, dirName.string());

        if (dirNameLen == 0 ||

            (strncmp(nameBuf, dirName.string(), dirNameLen) == 0 &&

             nameBuf[dirNameLen] == '/'))

        if (dirNameLen == 0 || nameBuf[dirNameLen] == '/')

        {

            const char* cp;

            const char* nextSlash;