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
commit25bc410b31b81415b6833e13148aeaef03e379ab (patch)
tree3b645c782ea2ae41a1b6ba3c3f88a61095643fe1
parentdc128f220b59f04eeca46d3c19a71beefabde64f (diff)
parent74cfbe12393cce6456c4cfce87a24c2054d6e5d7 (diff)
downloadframeworks_native-25bc410b31b81415b6833e13148aeaef03e379ab.zip
frameworks_native-25bc410b31b81415b6833e13148aeaef03e379ab.tar.gz
frameworks_native-25bc410b31b81415b6833e13148aeaef03e379ab.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");