Revert "[res] Optimize isUpToDate() for ApkAssets"

Revert submission 31021037

Reason for revert: Droidmonitor created revert due to b/388342212. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:31021037

Change-Id: I7d0eeaf7476c66f5276c68320f93f2b56953d531

1 files changed, 3 insertions, 6 deletions

diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp
index e693fcfd3918..dbb891455ddd 100644
--- a/libs/androidfw/ApkAssets.cpp
+++ b/libs/androidfw/ApkAssets.cpp
@@ -162,13 +162,10 @@ const std::string& ApkAssets::GetDebugName() const {
   return assets_provider_->GetDebugName();
 }
 
-UpToDate ApkAssets::IsUpToDate() const {
+bool ApkAssets::IsUpToDate() const {
   // Loaders are invalidated by the app, not the system, so assume they are up to date.
-  if (IsLoader()) {
-    return UpToDate::Always;
-  }
-  const auto idmap_res = loaded_idmap_ ? loaded_idmap_->IsUpToDate() : UpToDate::Always;
-  return combine(idmap_res, [this] { return assets_provider_->IsUpToDate(); });
+  return IsLoader() || ((!loaded_idmap_ || loaded_idmap_->IsUpToDate())
+                        && assets_provider_->IsUpToDate());
 }
 
 }  // namespace android