diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-24 12:56:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-24 12:56:52 +0000 |
| commit | 76507a64b530c757dc284f1f4d0807ffbfd9a701 (patch) | |
| tree | 18ec820c1dd7fb03a97636fcc5451fd88e049cc2 /libs | |
| parent | 948682d15f1a4a6676318213a49b50b967cfae27 (diff) | |
| parent | 72dc62ead214bdec5c46d42f4e859b139dba0a00 (diff) | |
| download | frameworks_base-76507a64b530c757dc284f1f4d0807ffbfd9a701.zip frameworks_base-76507a64b530c757dc284f1f4d0807ffbfd9a701.tar.gz frameworks_base-76507a64b530c757dc284f1f4d0807ffbfd9a701.tar.bz2 | |
am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
Track removal of refcounts from FileMap.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/Asset.cpp | 6 | ||||
| -rw-r--r-- | libs/androidfw/ZipFileRO.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp index 4b3382e..782806e 100644 --- a/libs/androidfw/Asset.cpp +++ b/libs/androidfw/Asset.cpp @@ -532,7 +532,7 @@ off64_t _FileAsset::seek(off64_t offset, int whence) void _FileAsset::close(void) { if (mMap != NULL) { - mMap->release(); + delete mMap; mMap = NULL; } if (mBuf != NULL) { @@ -612,7 +612,7 @@ const void* _FileAsset::getBuffer(bool wordAligned) map = new FileMap; if (!map->create(NULL, fileno(mFp), mStart, mLength, true)) { - map->release(); + delete map; return NULL; } @@ -827,7 +827,7 @@ off64_t _CompressedAsset::seek(off64_t offset, int whence) void _CompressedAsset::close(void) { if (mMap != NULL) { - mMap->release(); + delete mMap; mMap = NULL; } diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index ef0d072..af3d9b3 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -200,7 +200,7 @@ FileMap* ZipFileRO::createEntryFileMap(ZipEntryRO entry) const FileMap* newMap = new FileMap(); if (!newMap->create(mFileName, fd, ze.offset, actualLen, true)) { - newMap->release(); + delete newMap; return NULL; } |