diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-11-16 23:08:18 +0000 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2020-12-08 16:59:06 +0000 |
| commit | a45506e6f6619f59ce1ae94b20ad377b86966be0 (patch) | |
| tree | 377104fd9714aabca65cbb343971fd2cda1d00a8 /libs/androidfw/include | |
| parent | e7ab62723ac8bc1c95405353e7f625956b1dfbe3 (diff) | |
Revert^2 "Cache resolved theme values"
6ca48473e533a8b89abac6294a0bb8130b8c8c89
Change-Id: Icb295186b85e1edcdcebc1d746f7ff0d6ef66829
Merged-In: Icb295186b85e1edcdcebc1d746f7ff0d6ef66829
Diffstat (limited to 'libs/androidfw/include')
| -rw-r--r-- | libs/androidfw/include/androidfw/AssetManager2.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libs/androidfw/include/androidfw/AssetManager2.h b/libs/androidfw/include/androidfw/AssetManager2.h index 4e993b0838a2..a92694c94b9f 100644 --- a/libs/androidfw/include/androidfw/AssetManager2.h +++ b/libs/androidfw/include/androidfw/AssetManager2.h @@ -264,11 +264,14 @@ class AssetManager2 { // 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`. + // 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`. // // 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) const; + base::expected<std::monostate, NullOrIOError> ResolveReference(SelectedValue& value, + bool cache_value = false) const; // Retrieves the best matching bag/map resource with ID `resid`. // @@ -446,13 +449,14 @@ class AssetManager2 { // 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, |