commit 688ff4cf0f93d1a886437884f23874e5595d59a3
author Narayan Kamath <narayan@google.com> Mon Feb 23 15:47:54 2015 +0000
committer Narayan Kamath <narayan@google.com> Mon Feb 23 15:47:54 2015 +0000
tree b8ef91775dfc3dff86d05aa5638b17dee597ca91
parent adb52ef7034d4d3e0eee58cedae2a343d29771b9

Track removal of refcounts from FileMap.

Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076

libs/androidfw/Asset.cpp

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 @@
 void _FileAsset::close(void)
 {
     if (mMap != NULL) {
-        mMap->release();
+        delete mMap;
         mMap = NULL;
     }
     if (mBuf != NULL) {
@@ -612,7 +612,7 @@
 
         map = new FileMap;
         if (!map->create(NULL, fileno(mFp), mStart, mLength, true)) {
-            map->release();
+            delete map;
             return NULL;
         }
 
@@ -827,7 +827,7 @@
 void _CompressedAsset::close(void)
 {
     if (mMap != NULL) {
-        mMap->release();
+        delete mMap;
         mMap = NULL;
     }
 

libs/androidfw/ZipFileRO.cpp

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* newMap = new FileMap();
     if (!newMap->create(mFileName, fd, ze.offset, actualLen, true)) {
-        newMap->release();
+        delete newMap;
         return NULL;
     }