commit 6ca48473e533a8b89abac6294a0bb8130b8c8c89
author Ryan Mitchell <rtmitchell@google.com> Fri Nov 13 23:55:20 2020 +0000
committer Ryan Mitchell <rtmitchell@google.com> Fri Nov 13 23:55:20 2020 +0000
tree da96bc5ed4429763b2aec93021ec7d0340ce0b98
parent 06a7331b84ceb4b39d39e4af187d1f988475893a

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

libs/androidfw/AttributeResolution.cpp

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()));
         }