This CL description is public.

PiperOrigin-RevId: 932878991

Author: OmniLab Team

src/java/com/google/devtools/mobileharness/platform/android/xts/suite/retry/RetryReportMerger.java

@@ -397,6 +397,9 @@ private Module doMergeModule(
             && matchedRetryExcludeTestFilters.isEmpty())
         || moduleFromRetry.getSkipped()) {
       // Try best to determine if the entire module was retried or skipped.
+      if (moduleFromRetry.getSkipped() && !moduleFromPrevSession.getSkipped()) {
+        return moduleFromRetry.toBuilder().setSkipped(false).build();
+      }
       return moduleFromRetry;
     }
     Module.Builder mergedModuleBuilder =

src/javatests/com/google/devtools/mobileharness/platform/android/xts/suite/retry/testdata/merged_report_module_failure_skipped.textproto

@@ -52,8 +52,8 @@ summary {
   passed: 0
   failed: 0
   warning: 0
-  modules_done: 0
-  modules_total: 0
+  modules_done: 1
+  modules_total: 1
 }
 module_info {
   name: "CtsVcnTestCases"
@@ -67,7 +67,7 @@ module_info {
   }
   failed_tests: 0
   warning_tests: 0
-  skipped: true
+  skipped: false
 }
 attribute {
   key: "start"