Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Resources] house keeping in TypeList" am: ff2e03cfce am: 516bd5f862

Browse Source 
am: 2d604852ce

Change-Id: I983ab5312b484a8d3f8adafd693f2435c460ab5a
This commit is contained in:
Sean Lu
2017-06-26 23:09:29 +00:00
committed by android-build-merger
parent b0bb373286 2d604852ce
commit 5386fcf965
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/androidfw/ResourceTypes.cpp
View File

@@ -3313,13 +3313,14 @@ struct ResTable::PackageGroup
clearBagCache(); clearBagCache();
const size_t numTypes = types.size(); const size_t numTypes = types.size();
for (size_t i = 0; i < numTypes; i++) { for (size_t i = 0; i < numTypes; i++) {
const TypeList& typeList = types[i]; TypeList& typeList = types.editItemAt(i);
const size_t numInnerTypes = typeList.size(); const size_t numInnerTypes = typeList.size();
for (size_t j = 0; j < numInnerTypes; j++) { for (size_t j = 0; j < numInnerTypes; j++) {
if (typeList[j]->package->owner == owner) { if (typeList[j]->package->owner == owner) {
delete typeList[j]; delete typeList[j];
} }
} }
typeList.clear();
} }
const size_t N = packages.size(); const size_t N = packages.size();