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

Revert "Do not cache bag parent stack until requested"

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: Ib06f254ca4ac6fdec1f9cf75e6fdab35c7d4fb32
This commit is contained in:
Ryan Mitchell
2020-11-13 23:55:20 +00:00
parent 5602dc9374
commit 06a7331b84
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/androidfw/AssetManager2.cpp
View File

@@ -1036,7 +1036,9 @@ base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::ResolveBag(
base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::GetBag(uint32_t resid) const {
std::vector<uint32_t> found_resids;
return GetBag(resid, found_resids);
const auto bag = GetBag(resid, found_resids);
cached_bag_resid_stacks_.emplace(resid, found_resids);
return bag;
}
base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::GetBag(