diff options
author | 2020-11-13 23:55:20 +0000 | |
---|---|---|
committer | 2020-11-13 23:55:20 +0000 | |
commit | 06a7331b84ceb4b39d39e4af187d1f988475893a (patch) | |
tree | c99f5e1e0f712e5fcf88c928b8ed03f96b067392 /libs/androidfw/AssetManager2.cpp | |
parent | 5602dc9374934a42964e0f57faa3c0aad43003e1 (diff) |
Revert "Do not cache bag parent stack until requested"
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
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
-rw-r--r-- | libs/androidfw/AssetManager2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index c49dc28124b2..d349628c2ab4 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -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( |