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

Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I05aad42f7077ee8f285e8df581608e872731834c
This commit is contained in:
Ryan Mitchell
2021-05-20 23:37:22 +00:00
committed by Automerger Merge Worker
parent 29cccc0b0e 47e58f1238
commit a73daaeb5c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/aapt2/dump/DumpManifest.cpp
View File

@@ -1978,12 +1978,13 @@ bool ManifestExtractor::Dump(text::Printer* printer, IDiagnostics* diag) {
filtered_uses_sdk_tags.emplace_back(uses_sdk);
}
}
filtered_uses_sdk_tags.pop_back();
root->Filter([&](const ManifestExtractor::Element* e) {
return std::find(filtered_uses_sdk_tags.begin(), filtered_uses_sdk_tags.end(), e) !=
filtered_uses_sdk_tags.end();
});
if (filtered_uses_sdk_tags.size() >= 2U) {
filtered_uses_sdk_tags.pop_back();
root->Filter([&](const ManifestExtractor::Element* e) {
return std::find(filtered_uses_sdk_tags.begin(), filtered_uses_sdk_tags.end(), e) !=
filtered_uses_sdk_tags.end();
});
}
// Print the elements in order seen
Print(root.get(), printer);