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

Merge "Ignore resources from unknown types" am: e0f44eb6e7 am: a4bb7ab3b4 am: fda617812b am: 2a2720593f

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

Change-Id: I08a89f035d241fa0ecc1aaf81c5e37b136a5cf8b
This commit is contained in:
Treehugger Robot
2020-09-17 23:14:21 +00:00
committed by Automerger Merge Worker
parent 5ca2279b53 2a2720593f
commit 1946bfb890
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/Resource.cpp
View File

@@ -96,8 +96,6 @@ StringPiece to_string(ResourceType type) {
return "styleable";
case ResourceType::kTransition:
return "transition";
case ResourceType::kUnknown:
return "unknown";
case ResourceType::kXml:
return "xml";
}

5
tools/aapt2/Resource.h
View File

@@ -66,11 +66,6 @@ enum class ResourceType {
kStyle,
kStyleable,
kTransition,
// Not a parsed type. It is only used when loading resource tables that may have modified type
// names
kUnknown,
kXml,
};

21
tools/aapt2/format/binary/BinaryResourceParser.cpp
View File

@@ -352,15 +352,15 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package,
config.copyFromDtoH(type->config);
const std::string type_str = util::GetString(type_pool_, type->id - 1);
// Be lenient on the name of the type if the table is lenient on resource validation.
auto parsed_type = ResourceType::kUnknown;
if (const ResourceType* parsed = ParseResourceType(type_str)) {
parsed_type = *parsed;
} else if (table_->GetValidateResources()) {
diag_->Error(DiagMessage(source_) << "invalid type name '" << type_str << "' for type with ID "
<< (int) type->id);
return false;
const ResourceType* parsed_type = ParseResourceType(type_str);
if (!parsed_type) {
// Be lenient on the name of the type if the table is lenient on resource validation.
bool log_error = table_->GetValidateResources();
if (log_error) {
diag_->Error(DiagMessage(source_) << "invalid type name '" << type_str
<< "' for type with ID " << type->id);
}
return !log_error;
}
TypeVariant tv(type);
@@ -370,9 +370,8 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package,
continue;
}
const ResourceName name(package->name, parsed_type,
const ResourceName name(package->name, *parsed_type,
util::GetString(key_pool_, util::DeviceToHost32(entry->key.index)));
const ResourceId res_id(package->id.value(), type->id, static_cast<uint16_t>(it.index()));
std::unique_ptr<Value> resource_value;