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

Revert "libandroidfw hardening for IncFs"

Browse Source 
Revert "Move map_ptr to incfs namspace"

Revert submission 12787270

Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values

Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
This commit is contained in:
Ryan Mitchell
2020-11-13 23:55:20 +00:00
parent 6ca48473e5
commit 55ef6167a2
63 changed files with 2385 additions and 2635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/ResourceTable.cpp
View File

@@ -3066,7 +3066,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
for (size_t ti=0; ti<N; ti++) {
// Retrieve them in the same order as the type string block.
size_t len;
String16 typeName(UnpackOptionalString(p->getTypeStrings().stringAt(ti), &len));
String16 typeName(p->getTypeStrings().stringAt(ti, &len));
sp<Type> t = p->getTypes().valueFor(typeName);
LOG_ALWAYS_FATAL_IF(t == NULL && typeName != String16("<empty>"),
"Type name %s not found",
@@ -4169,7 +4169,7 @@ status_t ResourceTable::Package::setStrings(const sp<AaptFile>& data,
const size_t N = strings->size();
for (size_t i=0; i<N; i++) {
size_t len;
mappings->add(String16(UnpackOptionalString(strings->stringAt(i), &len)), i);
mappings->add(String16(strings->stringAt(i, &len)), i);
}
}
return err;