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

Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340

Browse Source 
am: c97c9dbd96

Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d
This commit is contained in:
Hans Boehm
2016-08-11 17:32:34 +00:00
committed by android-build-merger
parent 93d8ffc4f3 c97c9dbd96
commit a33407d2f8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/aapt/AaptAssets.cpp
View File

@@ -1309,8 +1309,8 @@ bail:
status_t AaptAssets::filter(Bundle* bundle)
{
WeakResourceFilter reqFilter;
status_t err = reqFilter.parse(bundle->getConfigurations());
sp<WeakResourceFilter> reqFilter(new WeakResourceFilter());
status_t err = reqFilter->parse(bundle->getConfigurations());
if (err != NO_ERROR) {
return err;
}
@@ -1326,12 +1326,12 @@ status_t AaptAssets::filter(Bundle* bundle)
preferredDensity = preferredConfig.density;
}
if (reqFilter.isEmpty() && preferredDensity == 0) {
if (reqFilter->isEmpty() && preferredDensity == 0) {
return NO_ERROR;
}
if (bundle->getVerbose()) {
if (!reqFilter.isEmpty()) {
if (!reqFilter->isEmpty()) {
printf("Applying required filter: %s\n",
bundle->getConfigurations().string());
}
@@ -1383,7 +1383,7 @@ status_t AaptAssets::filter(Bundle* bundle)
continue;
}
const ResTable_config& config(file->getGroupEntry().toParams());
if (!reqFilter.match(config)) {
if (!reqFilter->match(config)) {
if (bundle->getVerbose()) {
printf("Pruning unneeded resource: %s\n",
file->getPrintableSource().string());