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

Commit e2d396f7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Black Screen: Fix dlfree error when delet mZipInflater."

parents 82bb9d95 16a1f52f

include/androidfw/Asset.h

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <utils/Errors.h>

#include <utils/FileMap.h>

#include <utils/String8.h>

#include <utils/threads.h>



namespace android {
@@ -272,7 +273,7 @@ class _CompressedAsset : public Asset { 
public:

    _CompressedAsset(void);

    virtual ~_CompressedAsset(void);



    Mutex mCompressedAssetLock;

    /*

     * Use a piece of an already-open file.

     *

libs/androidfw/Asset.cpp

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -820,6 +820,7 @@ off64_t _CompressedAsset::seek(off64_t offset, int whence) 
 */

void _CompressedAsset::close(void)

{

    AutoMutex _l(mCompressedAssetLock);

    if (mMap != NULL) {

        mMap->release();

        mMap = NULL;
@@ -845,6 +846,7 @@ void _CompressedAsset::close(void) 
 */

const void* _CompressedAsset::getBuffer(bool)

{

    AutoMutex _l(mCompressedAssetLock);

    unsigned char* buf = NULL;



    if (mBuf != NULL)