commit d0c969f2e4cd35de32019443ddf8dea1d8acd38b
author Jiakai Zhang <jiakaiz@google.com> Tue Jan 18 16:02:54 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 21 12:21:19 2022 +0000
tree 882555c26fbee5257dc62222d152dec51803ae8e
parent 5bd22087faeb2caf5057aaab63717afab082f447

Set the trigger to be kApexVersionMismatch when no prior cache-info.

If the APEXes are not factory-installed and there is no prior
cache-info, it means the APEXes are newly installed, so we should set
the trigger to be kApexVersionMismatch to make sure that compilation
will always be performed regardless of retry backoff time.

Bug: 215155943
Change-Id: I3a905233182f7ec9c380f63de6a382902b3e8723
Test: Run `atest odsign_e2e_tests` twice consecutively on a `user` build
  device that does not allow removing compilation log due to access
  restriction.

odrefresh/odrefresh.cc

diff --git a/odrefresh/odrefresh.cc b/odrefresh/odrefresh.cc
index b8e42f3..4a489f7 100644
--- a/odrefresh/odrefresh.cc
+++ b/odrefresh/odrefresh.cc
@@ -856,10 +856,12 @@
   }
 
   if (!cache_info.has_value()) {
-    // If the cache info file does not exist, it means on-device compilation has not been done
-    // before.
+    // If the cache info file does not exist, it usually means on-device compilation has not been
+    // done before because the device was using the factory version of modules, or artifacts were
+    // cleared because an updated version was uninstalled. Set the trigger to be
+    // `kApexVersionMismatch` so that compilation will always be performed.
     PLOG(INFO) << "No prior cache-info file: " << QuotePath(cache_info_filename_);
-    metrics.SetTrigger(OdrMetrics::Trigger::kMissingArtifacts);
+    metrics.SetTrigger(OdrMetrics::Trigger::kApexVersionMismatch);
     return false;
   }
 
@@ -974,10 +976,12 @@
   }
 
   if (!cache_info.has_value()) {
-    // If the cache info file does not exist, it means on-device compilation has not been done
-    // before.
+    // If the cache info file does not exist, it usually means on-device compilation has not been
+    // done before because the device was using the factory version of modules, or artifacts were
+    // cleared because an updated version was uninstalled. Set the trigger to be
+    // `kApexVersionMismatch` so that compilation will always be performed.
     PLOG(INFO) << "No prior cache-info file: " << QuotePath(cache_info_filename_);
-    metrics.SetTrigger(OdrMetrics::Trigger::kMissingArtifacts);
+    metrics.SetTrigger(OdrMetrics::Trigger::kApexVersionMismatch);
     if (artifacts_on_system_up_to_date) {
       *jars_to_compile = jars_missing_artifacts_on_system;
       return false;