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

Revert^2 "libandroidfw hardening for IncFs"

Browse Source 
55ef6167a2

Change-Id: I02d4890d181655dfd0a14c188468db512559d27b
This commit is contained in:
Ryan Mitchell
2020-11-16 23:08:18 +00:00
parent 687f5e163f
commit db21f09a8e
63 changed files with 2644 additions and 2394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,21 +72,21 @@ StringPiece DataTypeToString(uint8_t data_type) {
}
Result<std::string> ResToTypeEntryName(const AssetManager2& am, uint32_t resid) {
AssetManager2::ResourceName name;
if (!am.GetResourceName(resid, &name)) {
const auto name = am.GetResourceName(resid);
if (!name.has_value()) {
return Error("no resource 0x%08x in asset manager", resid);
}
std::string out;
if (name.type != nullptr) {
out.append(name.type, name.type_len);
if (name->type != nullptr) {
out.append(name->type, name->type_len);
} else {
out += Utf16ToUtf8(StringPiece16(name.type16, name.type_len));
out += Utf16ToUtf8(StringPiece16(name->type16, name->type_len));
}
out.append("/");
if (name.entry != nullptr) {
out.append(name.entry, name.entry_len);
if (name->entry != nullptr) {
out.append(name->entry, name->entry_len);
} else {
out += Utf16ToUtf8(StringPiece16(name.entry16, name.entry_len));
out += Utf16ToUtf8(StringPiece16(name->entry16, name->entry_len));
}
return out;
}