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

Merge "Add requiredSystemPropertyValue support in idmap2"

Browse Source
This commit is contained in:
Ryan Mitchell
2019-10-02 16:48:50 +00:00
committed by Gerrit Code Review
parent a8bfed9104 d7fc4f774a
commit b30f65713f
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmds/idmap2/idmap2/Scan.cpp
View File

@@ -176,6 +176,17 @@ Result<Unit> Scan(const std::vector<std::string>& args) {
continue; continue;
} }
// Note that conditional property enablement/exclusion only applies if
// the attribute is present. In its absence, all overlays are presumed enabled.
if (!overlay_info->requiredSystemPropertyName.empty()
&& !overlay_info->requiredSystemPropertyValue.empty()) {
// if property set & equal to value, then include overlay - otherwise skip
if (android::base::GetProperty(overlay_info->requiredSystemPropertyName, "")
!= overlay_info->requiredSystemPropertyValue) {
continue;
}
}
std::vector<std::string> fulfilled_policies; std::vector<std::string> fulfilled_policies;
if (!override_policies.empty()) { if (!override_policies.empty()) {
fulfilled_policies = override_policies; fulfilled_policies = override_policies;

2
cmds/idmap2/include/idmap2/ResourceUtils.h
View File

@@ -30,6 +30,8 @@ namespace android::idmap2::utils {
struct OverlayManifestInfo { struct OverlayManifestInfo {
std::string target_package; // NOLINT(misc-non-private-member-variables-in-classes) std::string target_package; // NOLINT(misc-non-private-member-variables-in-classes)
std::string target_name; // NOLINT(misc-non-private-member-variables-in-classes) std::string target_name; // NOLINT(misc-non-private-member-variables-in-classes)
std::string requiredSystemPropertyName; // NOLINT(misc-non-private-member-variables-in-classes)
std::string requiredSystemPropertyValue; // NOLINT(misc-non-private-member-variables-in-classes)
bool is_static; // NOLINT(misc-non-private-member-variables-in-classes) bool is_static; // NOLINT(misc-non-private-member-variables-in-classes)
int priority = -1; // NOLINT(misc-non-private-member-variables-in-classes) int priority = -1; // NOLINT(misc-non-private-member-variables-in-classes)
}; };

10
cmds/idmap2/libidmap2/ResourceUtils.cpp
View File

@@ -103,6 +103,16 @@ Result<OverlayManifestInfo> ExtractOverlayManifestInfo(const std::string& path,
info.priority = std::stoi(iter->second); info.priority = std::stoi(iter->second);
} }
iter = tag->find("requiredSystemPropertyName");
if (iter != tag->end()) {
info.requiredSystemPropertyName = iter->second;
}
iter = tag->find("requiredSystemPropertyValue");
if (iter != tag->end()) {
info.requiredSystemPropertyValue = iter->second;
}
return info; return info;
} }