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

Commit fbe2bd37 authored by Pawan Wagh's avatar Pawan Wagh
Browse files

Combine ZipFileRO::getEntryInfo 

Removing getEntryInfo which doesn't contain extra field size
and fixing the usage.

Test: mma libandroidfw
Bug: 334109171
Change-Id: Id5c8a5405265e6964f5b56b253430eb7c49cdc02
parent 06cb3424

libs/androidfw/AssetManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -926,8 +926,8 @@ Asset* AssetManager::openAssetFromZipLocked(const ZipFileRO* pZipFile, 


    //printf("USING Zip '%s'\n", pEntry->getFileName());



    if (!pZipFile->getEntryInfo(entry, &method, &uncompressedLen, NULL, NULL,

            NULL, NULL))

    if (!pZipFile->getEntryInfo(entry, &method, &uncompressedLen, nullptr, nullptr,

            nullptr, nullptr, nullptr))

    {

        ALOGW("getEntryInfo failed\n");

        return NULL;

libs/androidfw/ZipFileRO.cpp

+0 −8
Original line number Diff line number Diff line
@@ -118,14 +118,6 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const 
 * Returns "false" if the offsets to the fields or the contents of the fields

 * appear to be bogus.

 */

bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod,

 uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset,

 uint32_t* pModWhen, uint32_t* pCrc32) const

{

     return getEntryInfo(entry, pMethod, pUncompLen, pCompLen, pOffset, pModWhen,

      pCrc32, nullptr);

}



bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod,

    uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset,

    uint32_t* pModWhen, uint32_t* pCrc32, uint16_t* pExtraFieldSize) const

libs/androidfw/include/androidfw/ZipFileRO.h

+0 −4
Original line number Diff line number Diff line
@@ -147,10 +147,6 @@ public: 
     * Returns "false" if "entry" is bogus or if the data in the Zip file

     * appears to be bad.

     */

    bool getEntryInfo(ZipEntryRO entry, uint16_t* pMethod, uint32_t* pUncompLen,

        uint32_t* pCompLen, off64_t* pOffset, uint32_t* pModWhen,

        uint32_t* pCrc32) const;



    bool getEntryInfo(ZipEntryRO entry, uint16_t* pMethod,

        uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset,

        uint32_t* pModWhen, uint32_t* pCrc32, uint16_t* pExtraFieldSize) const;