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

Commit f991771f authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Use size_t* in AssetManager::createIdmap"

parents 89492190 ecbeae74

include/androidfw/AssetManager.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -231,7 +231,7 @@ public: 
     * corresponding overlay package.

     * corresponding overlay package.

     */

     */

    bool createIdmap(const char* targetApkPath, const char* overlayApkPath,

    bool createIdmap(const char* targetApkPath, const char* overlayApkPath,

        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, uint32_t* outSize);

        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize);





private:

private:

    struct asset_path

    struct asset_path

libs/androidfw/AssetManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -285,7 +285,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) 
 }

 }





bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath,

bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath,

        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, uint32_t* outSize)

        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize)

{

{

    AutoMutex _l(mLock);

    AutoMutex _l(mLock);

    const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) };

    const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) };