summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-08-29 18:49:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 18:49:14 +0000
commitec187b726b9227239f7a678e0872f52f53dfa271 (patch)
tree3eabd2079342b40b2be8773b290286a074e152fd /libs/androidfw
parent2966c8689d372a78acd1c9e24ad32f68d4c7b17c (diff)
parent88fff68115122e1a48099a9a6edc792cf411a22f (diff)
downloadframeworks_base-ec187b726b9227239f7a678e0872f52f53dfa271.zip
frameworks_base-ec187b726b9227239f7a678e0872f52f53dfa271.tar.gz
frameworks_base-ec187b726b9227239f7a678e0872f52f53dfa271.tar.bz2
am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev
* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb': Fix memory leak in ResTable
Diffstat (limited to 'libs/androidfw')
-rw-r--r--libs/androidfw/ResourceTypes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 90879dd..690b1d6 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -2939,7 +2939,7 @@ struct ResTable::PackageGroup
for (size_t i = 0; i < bags->size(); i++) {
TABLE_NOISY(printf("type=%d\n", i));
const TypeList& typeList = types[i];
- if (typeList.isEmpty()) {
+ if (!typeList.isEmpty()) {
bag_set** typeBags = bags->get(i);
TABLE_NOISY(printf("typeBags=%p\n", typeBags));
if (typeBags) {