summaryrefslogtreecommitdiffstats
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-05-10 16:19:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-10 16:19:29 -0700
commit041aa34e089d7b194a5d93c682c3af3d3116d3f3 (patch)
tree06434281de5896603c193d2441f83958f3c2b375 /libs/utils/AssetManager.cpp
parentee60f3fb1b4e61ac8027293a658ba710e36d36b6 (diff)
parent87d86044c0f15ae2ffc0350271c76ff874fb413b (diff)
downloadframeworks_base-041aa34e089d7b194a5d93c682c3af3d3116d3f3.zip
frameworks_base-041aa34e089d7b194a5d93c682c3af3d3116d3f3.tar.gz
frameworks_base-041aa34e089d7b194a5d93c682c3af3d3116d3f3.tar.bz2
am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
* commit '87d86044c0f15ae2ffc0350271c76ff874fb413b': Add missing clean-up of idmap file descriptors.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
-rw-r--r--libs/utils/AssetManager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp
index 13004cd..0b4d1ac 100644
--- a/libs/utils/AssetManager.cpp
+++ b/libs/utils/AssetManager.cpp
@@ -680,6 +680,9 @@ const ResTable* AssetManager::getResTable(bool required) const
delete ass;
}
}
+ if (idmap != NULL) {
+ delete idmap;
+ }
}
if (required && !rt) LOGW("Unable to find resources file resources.arsc");