summaryrefslogtreecommitdiffstats
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
commit74cfbe12393cce6456c4cfce87a24c2054d6e5d7 (patch)
tree1ec4d75712b4d17a995a065d2afe558b9ecd444c
parent49b2ebe8b3521ccc552949fc242a5a4f29b4e72a (diff)
parentd701fd181935d6abc6c046a99f855b5ccc5c2d27 (diff)
downloadframeworks_native-74cfbe12393cce6456c4cfce87a24c2054d6e5d7.zip
frameworks_native-74cfbe12393cce6456c4cfce87a24c2054d6e5d7.tar.gz
frameworks_native-74cfbe12393cce6456c4cfce87a24c2054d6e5d7.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.
-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");