Revert "Cache resolved theme values"
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: Ibec051c79dfd28783a57b9ae82ebd8cdbed82fce
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp
index d349628..3e54dc6 100644
--- a/libs/androidfw/AssetManager2.cpp
+++ b/libs/androidfw/AssetManager2.cpp
@@ -963,25 +963,14 @@
}
base::expected<std::monostate, NullOrIOError> AssetManager2::ResolveReference(
- AssetManager2::SelectedValue& value, bool cache_value) const {
+ AssetManager2::SelectedValue& value) const {
if (value.type != Res_value::TYPE_REFERENCE || value.data == 0U) {
// Not a reference. Nothing to do.
return {};
}
- const uint32_t original_flags = value.flags;
- const uint32_t original_resid = value.data;
- if (cache_value) {
- auto cached_value = cached_resolved_values_.find(value.data);
- if (cached_value != cached_resolved_values_.end()) {
- value = cached_value->second;
- value.flags |= original_flags;
- return {};
- }
- }
-
- uint32_t combined_flags = 0U;
- uint32_t resolve_resid = original_resid;
+ uint32_t combined_flags = value.flags;
+ uint32_t resolve_resid = value.data;
constexpr const uint32_t kMaxIterations = 20;
for (uint32_t i = 0U;; i++) {
auto result = GetResource(resolve_resid, true /*may_be_bag*/);
@@ -992,15 +981,9 @@
if (result->type != Res_value::TYPE_REFERENCE ||
result->data == Res_value::DATA_NULL_UNDEFINED ||
result->data == resolve_resid || i == kMaxIterations) {
- result->flags |= combined_flags;
- if (cache_value) {
- cached_resolved_values_[original_resid] = *result;
- }
-
- // Add the original flags after caching the result so queries with a different set of original
- // flags do not include these original flags.
+ // This reference can't be resolved, so exit now and let the caller deal with it.
value = *result;
- value.flags |= original_flags;
+ value.flags |= combined_flags;
return {};
}
@@ -1370,8 +1353,6 @@
++iter;
}
}
-
- cached_resolved_values_.clear();
}
uint8_t AssetManager2::GetAssignedPackageId(const LoadedPackage* package) const {
@@ -1552,7 +1533,7 @@
return base::unexpected(std::nullopt);
}
- auto resolve_result = asset_manager_->ResolveReference(*result, true /* cache_value */);
+ auto resolve_result = asset_manager_->ResolveReference(*result);
if (resolve_result.has_value()) {
result->flags |= value.flags;
value = *result;
diff --git a/libs/androidfw/AttributeResolution.cpp b/libs/androidfw/AttributeResolution.cpp
index 347b4ec..71919fd 100644
--- a/libs/androidfw/AttributeResolution.cpp
+++ b/libs/androidfw/AttributeResolution.cpp
@@ -39,7 +39,8 @@
: public BackTrackingAttributeFinder<XmlAttributeFinder, size_t> {
public:
explicit XmlAttributeFinder(const ResXMLParser* parser)
- : BackTrackingAttributeFinder(0, parser != nullptr ? parser->getAttributeCount() : 0),
+ : BackTrackingAttributeFinder(
+ 0, parser != nullptr ? parser->getAttributeCount() : 0),
parser_(parser) {}
inline uint32_t GetAttribute(size_t index) const {
@@ -177,7 +178,7 @@
value = *attr_value;
DEBUG_LOG("-> From theme: type=0x%x, data=0x%08x", value.type, value.data);
- const auto result = assetmanager->ResolveReference(value, true /* cache_value */);
+ const auto result = assetmanager->ResolveReference(value);
if (UNLIKELY(IsIOError(result))) {
return base::unexpected(GetIOError(result.error()));
}
@@ -309,7 +310,7 @@
value = *attr_value;
DEBUG_LOG("-> From theme: type=0x%x, data=0x%08x", value.type, value.data);
- auto result = assetmanager->ResolveReference(value, true /* cache_value */);
+ auto result = assetmanager->ResolveReference(value);
if (UNLIKELY(IsIOError(result))) {
return base::unexpected(GetIOError(result.error()));
}
diff --git a/libs/androidfw/include/androidfw/AssetManager2.h b/libs/androidfw/include/androidfw/AssetManager2.h
index a92694c..4e993b0 100644
--- a/libs/androidfw/include/androidfw/AssetManager2.h
+++ b/libs/androidfw/include/androidfw/AssetManager2.h
@@ -264,14 +264,11 @@
// Resolves the resource referenced in `value` if the type is Res_value::TYPE_REFERENCE.
//
// If the data type is not Res_value::TYPE_REFERENCE, no work is done. Configuration flags of the
- // values pointed to by the reference are OR'd into `value.flags`. If `cache_value` is true, then
- // the resolved value will be cached and used when attempting to resolve the resource id specified
- // in `value`.
+ // values pointed to by the reference are OR'd into `value.flags`.
//
// Returns a null error if the resource could not be resolved, or an I/O error if reading
// resource data failed.
- base::expected<std::monostate, NullOrIOError> ResolveReference(SelectedValue& value,
- bool cache_value = false) const;
+ base::expected<std::monostate, NullOrIOError> ResolveReference(SelectedValue& value) const;
// Retrieves the best matching bag/map resource with ID `resid`.
//
@@ -449,14 +446,13 @@
// a number of times for each view during View inspection.
mutable std::unordered_map<uint32_t, std::vector<uint32_t>> cached_bag_resid_stacks_;
- // Cached set of resolved resource values.
- mutable std::unordered_map<uint32_t, SelectedValue> cached_resolved_values_;
-
// Whether or not to save resource resolution steps
bool resource_resolution_logging_enabled_ = false;
struct Resolution {
+
struct Step {
+
enum class Type {
INITIAL,
BETTER_MATCH,