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

Fix copying null reference across themes

Browse Source 
When themes have two different AssetManagers, we only copy attributes
that exist in both the themes. If the value of the attribute or
reference is equal to 0 (a null reference but not using the TYPE_NULL
type), do not attempt to fix the package id of that null reference.

Bug: 119522708
Test: manual test of broken app
Change-Id: Id615d5a47b7f121b08bbba885d106b9cd3f54afc
This commit is contained in:
Ryan Mitchell
2018-11-19 12:11:38 -08:00
parent b4bbd2c8a8
commit b85d9b2a32
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libs/androidfw/AssetManager2.cpp
View File

@@ -1183,8 +1183,32 @@ void Theme::SetTo(const Theme& o) {
continue;
}
// The package id of the attribute needs to be rewritten to the package id of the value in
// the destination
// If the attribute value represents an attribute or reference, the package id of the
// value needs to be rewritten to the package id of the value in the destination
uint32_t attribue_data = entry.value.data;
if ((entry.value.dataType == Res_value::TYPE_ATTRIBUTE
|| entry.value.dataType == Res_value::TYPE_REFERENCE
|| entry.value.dataType == Res_value::TYPE_DYNAMIC_ATTRIBUTE
|| entry.value.dataType == Res_value::TYPE_DYNAMIC_REFERENCE)
&& attribue_data != 0x0) {
// Determine the package id of the reference in the destination AssetManager
auto value_package_map = src_asset_cookie_id_map.find(entry.cookie);
if (value_package_map == src_asset_cookie_id_map.end()) {
continue;
}
auto value_dest_package = value_package_map->second.find(
get_package_id(entry.value.data));
if (value_dest_package == value_package_map->second.end()) {
continue;
}
attribue_data = fix_package_id(entry.value.data, value_dest_package->second);
}
// The package id of the attribute needs to be rewritten to the package id of the
// attribute in the destination
int attribute_dest_package_id = p;
if (attribute_dest_package_id != 0x01) {
// Find the cookie of the attribute resource id
@@ -1206,29 +1230,6 @@ void Theme::SetTo(const Theme& o) {
attribute_dest_package_id = attribute_dest_package->second;
}
// If the attribute value represents an attribute or reference, the package id of the
// value needs to be rewritten to the package id of the value in the destination
uint32_t attribue_data = entry.value.data;
if (entry.value.dataType == Res_value::TYPE_DYNAMIC_ATTRIBUTE
|| entry.value.dataType == Res_value::TYPE_DYNAMIC_REFERENCE
|| entry.value.dataType == Res_value::TYPE_ATTRIBUTE
|| entry.value.dataType == Res_value::TYPE_REFERENCE) {
// Determine the package id of the reference in the destination AssetManager
auto value_package_map = src_asset_cookie_id_map.find(entry.cookie);
if (value_package_map == src_asset_cookie_id_map.end()) {
continue;
}
auto value_dest_package = value_package_map->second.find(
get_package_id(entry.value.data));
if (value_dest_package == value_package_map->second.end()) {
continue;
}
attribue_data = fix_package_id(entry.value.data, value_dest_package->second);
}
// Lazily instantiate the destination package
std::unique_ptr<Package>& dest_package = packages_[attribute_dest_package_id];
if (dest_package == nullptr) {