Merge "libandroidfw: Fatal exception of dlfree often causes the system crashed" (28c900be) · Commits · e / os / android_frameworks_base

libs/androidfw/Asset.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ static Mutex gAssetLock;
		static int32_t gCount = 0;
		static Asset* gHead = NULL;
		static Asset* gTail = NULL;
		static Mutex sLock;

		int32_t Asset::getGlobalCount()
		{
		@@ -846,7 +847,9 @@ void _CompressedAsset::close(void)
		*/
		const void* _CompressedAsset::getBuffer(bool)
		{
		AutoMutex _l(mCompressedAssetLock);
		if (mBuf != NULL)
		return mBuf;
		AutoMutex _l(sLock);
		unsigned char* buf = NULL;

		if (mBuf != NULL)