Merge "Do not stack allocate RefBase object in AaptAssets::filter" (c97c9dbd) · Commits · e / os / android_frameworks_base

tools/aapt/AaptAssets.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -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());