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

Fix compatibility between 'aapt2 dump' and 'aapt dump.'.

Browse Source 
1. Report permissions declared only under <manifest>.
2. If the same feature reported multiple times: the last declaration
   wins.

Bug: b/260704482
Test: manual runs
Change-Id: Ic9ff32573d2bf6550c3a01ed3019da83590eda2f
This commit is contained in:
Iurii Makhno
2022-11-29 19:19:13 +00:00
parent f0f510e46d
commit 0df4e6d05f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1076,7 +1076,7 @@ class FeatureGroup : public ManifestExtractor::Element {
/** Adds a feature to the feature group. */
void AddFeature(const std::string& name, bool required = true, int32_t version = -1) {
features_.insert(std::make_pair(name, Feature{ required, version }));
features_.insert_or_assign(name, Feature{required, version});
if (required) {
if (name == "android.hardware.camera.autofocus" ||
name == "android.hardware.camera.flash") {
@@ -1348,6 +1348,11 @@ class UsesPermission : public ManifestExtractor::Element {
std::string impliedReason;
void Extract(xml::Element* element) override {
const auto parent_stack = extractor()->parent_stack();
if (!extractor()->options_.only_permissions &&
(parent_stack.size() != 1 || !ElementCast<Manifest>(parent_stack[0]))) {
return;
}
name = GetAttributeStringDefault(FindAttribute(element, NAME_ATTR), "");
std::string feature =
GetAttributeStringDefault(FindAttribute(element, REQUIRED_FEATURE_ATTR), "");
@@ -1472,6 +1477,11 @@ class UsesPermissionSdk23 : public ManifestExtractor::Element {
const int32_t* maxSdkVersion = nullptr;
void Extract(xml::Element* element) override {
const auto parent_stack = extractor()->parent_stack();
if (!extractor()->options_.only_permissions &&
(parent_stack.size() != 1 || !ElementCast<Manifest>(parent_stack[0]))) {
return;
}
name = GetAttributeString(FindAttribute(element, NAME_ATTR));
maxSdkVersion = GetAttributeInteger(FindAttribute(element, MAX_SDK_VERSION_ATTR));