Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 72dc62ea: Merge "Track removal of refcounts from FileMap."

Browse Source 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
This commit is contained in:
Narayan Kamath
2015-02-24 12:56:52 +00:00
committed by Android Git Automerger
parent 948682d15f 72dc62ead2
commit 76507a64b5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/bootanimation/AudioPlayer.cpp
View File

@@ -305,7 +305,7 @@ bool AudioPlayer::threadLoop()
exit: exit:
if (pcm) if (pcm)
pcm_close(pcm); pcm_close(pcm);
mCurrentFile->release(); delete mCurrentFile;
mCurrentFile = NULL; mCurrentFile = NULL;
return false; return false;
} }

4
cmds/bootanimation/BootAnimation.cpp
View File

@@ -179,7 +179,7 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
// FileMap memory is never released until application exit. // FileMap memory is never released until application exit.
// Release it now as the texture is already loaded and the memory used for // Release it now as the texture is already loaded and the memory used for
// the packed resource can be released. // the packed resource can be released.
frame.map->release(); delete frame.map;
// ensure we can call getPixels(). No need to call unlock, since the // ensure we can call getPixels(). No need to call unlock, since the
// bitmap will go out of scope when we return from this method. // bitmap will go out of scope when we return from this method.
@@ -446,7 +446,7 @@ bool BootAnimation::readFile(const char* name, String8& outString)
} }
outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength()); outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength());
entryMap->release(); delete entryMap;
return true; return true;
} }

6
cmds/idmap/scan.cpp
View File

@@ -147,20 +147,20 @@ namespace {
char *buf = new char[uncompLen]; char *buf = new char[uncompLen];
if (NULL == buf) { if (NULL == buf) {
ALOGW("%s: failed to allocate %zd byte\n", __FUNCTION__, uncompLen); ALOGW("%s: failed to allocate %zd byte\n", __FUNCTION__, uncompLen);
dataMap->release(); delete dataMap;
return -1; return -1;
} }
StreamingZipInflater inflater(dataMap, uncompLen); StreamingZipInflater inflater(dataMap, uncompLen);
if (inflater.read(buf, uncompLen) < 0) { if (inflater.read(buf, uncompLen) < 0) {
ALOGW("%s: failed to inflate %zd byte\n", __FUNCTION__, uncompLen); ALOGW("%s: failed to inflate %zd byte\n", __FUNCTION__, uncompLen);
delete[] buf; delete[] buf;
dataMap->release(); delete dataMap;
return -1; return -1;
} }
int priority = parse_manifest(buf, uncompLen, target_package_name); int priority = parse_manifest(buf, uncompLen, target_package_name);
delete[] buf; delete[] buf;
dataMap->release(); delete dataMap;
return priority; return priority;
} }
} }

6
libs/androidfw/Asset.cpp
View File

@@ -532,7 +532,7 @@ off64_t _FileAsset::seek(off64_t offset, int whence)
void _FileAsset::close(void) void _FileAsset::close(void)
{ {
if (mMap != NULL) { if (mMap != NULL) {
mMap->release(); delete mMap;
mMap = NULL; mMap = NULL;
} }
if (mBuf != NULL) { if (mBuf != NULL) {
@@ -612,7 +612,7 @@ const void* _FileAsset::getBuffer(bool wordAligned)
map = new FileMap; map = new FileMap;
if (!map->create(NULL, fileno(mFp), mStart, mLength, true)) { if (!map->create(NULL, fileno(mFp), mStart, mLength, true)) {
map->release(); delete map;
return NULL; return NULL;
} }
@@ -827,7 +827,7 @@ off64_t _CompressedAsset::seek(off64_t offset, int whence)
void _CompressedAsset::close(void) void _CompressedAsset::close(void)
{ {
if (mMap != NULL) { if (mMap != NULL) {
mMap->release(); delete mMap;
mMap = NULL; mMap = NULL;
} }

2
libs/androidfw/ZipFileRO.cpp
View File

@@ -200,7 +200,7 @@ FileMap* ZipFileRO::createEntryFileMap(ZipEntryRO entry) const
FileMap* newMap = new FileMap(); FileMap* newMap = new FileMap();
if (!newMap->create(mFileName, fd, ze.offset, actualLen, true)) { if (!newMap->create(mFileName, fd, ze.offset, actualLen, true)) {
newMap->release(); delete newMap;
return NULL; return NULL;
} }