summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-05-11 13:10:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-11 13:10:56 -0700
commit5911f958e80ea7475dc24a5752eda163228ea4b7 (patch)
tree80186575ae356bf64d68887d813a239cc1b41f81
parentafd28ac6ecec88065968fff66b8fc1a10e8f28ac (diff)
parent041aa34e089d7b194a5d93c682c3af3d3116d3f3 (diff)
downloadframeworks_base-5911f958e80ea7475dc24a5752eda163228ea4b7.zip
frameworks_base-5911f958e80ea7475dc24a5752eda163228ea4b7.tar.gz
frameworks_base-5911f958e80ea7475dc24a5752eda163228ea4b7.tar.bz2
am 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
* commit '041aa34e089d7b194a5d93c682c3af3d3116d3f3': 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 e41dd39..22034c5 100644
--- a/libs/utils/AssetManager.cpp
+++ b/libs/utils/AssetManager.cpp
@@ -681,6 +681,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");