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

Merge "Fix deserialization of @id aliases"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-18 22:58:06 +00:00
committed by Android (Google) Code Review
parent 2aea1e07e2 4abc82859d
commit a261d615dd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt2/ResourceUtils.cpp
View File

@@ -738,7 +738,13 @@ std::unique_ptr<Item> ParseBinaryResValue(const ResourceType& type, const Config
const android::Res_value& res_value,
StringPool* dst_pool) {
if (type == ResourceType::kId) {
return util::make_unique<Id>();
if (res_value.dataType != android::Res_value::TYPE_REFERENCE &&
res_value.dataType != android::Res_value::TYPE_DYNAMIC_REFERENCE) {
// plain "id" resources are actually encoded as dummy values (aapt1 uses an empty string,
// while aapt2 uses a false boolean).
return util::make_unique<Id>();
}
// fall through to regular reference deserialization logic
}
const uint32_t data = util::DeviceToHost32(res_value.data);