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

Merge "Do not include system overlay data when excluded"

Browse Source
This commit is contained in:
Ryan Mitchell
2018-12-04 20:04:33 +00:00
committed by Android (Google) Code Review
parent 50f3bbde56 449a54fb6b
commit 1e1d576b5c
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/androidfw/AssetManager2.cpp
View File

@@ -217,10 +217,19 @@ std::set<ResTable_config> AssetManager2::GetResourceConfigurations(bool exclude_
ATRACE_NAME("AssetManager::GetResourceConfigurations");
std::set<ResTable_config> configurations;
for (const PackageGroup& package_group : package_groups_) {
bool found_system_package = false;
for (const ConfiguredPackage& package : package_group.packages_) {
if (exclude_system && package.loaded_package_->IsSystem()) {
found_system_package = true;
continue;
}
if (exclude_system && package.loaded_package_->IsOverlay() && found_system_package) {
// Overlays must appear after the target package to take effect. Any overlay found in the
// same package as a system package is able to overlay system resources.
continue;
}
package.loaded_package_->CollectConfigurations(exclude_mipmap, &configurations);
}
}
@@ -232,10 +241,19 @@ std::set<std::string> AssetManager2::GetResourceLocales(bool exclude_system,
ATRACE_NAME("AssetManager::GetResourceLocales");
std::set<std::string> locales;
for (const PackageGroup& package_group : package_groups_) {
bool found_system_package = false;
for (const ConfiguredPackage& package : package_group.packages_) {
if (exclude_system && package.loaded_package_->IsSystem()) {
found_system_package = true;
continue;
}
if (exclude_system && package.loaded_package_->IsOverlay() && found_system_package) {
// Overlays must appear after the target package to take effect. Any overlay found in the
// same package as a system package is able to overlay system resources.
continue;
}
package.loaded_package_->CollectLocales(merge_equivalent_languages, &locales);
}
}