From 35bef7e4ec7f3e7f3650e16c38628208fea592d0 Mon Sep 17 00:00:00 2001
From: DeviceInfra <no-reply@google.com>
Date: Wed, 13 Nov 2024 01:04:33 -0800
Subject: [PATCH] Internal change

PiperOrigin-RevId: 696024387
---
 .../shared/file/resolver/AbstractFileResolver.java            | 4 ++--
 .../mobileharness/shared/file/resolver/CacheFileResolver.java | 2 +-
 .../mobileharness/shared/file/resolver/FileResolverTest.java  | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/java/com/google/devtools/mobileharness/shared/file/resolver/AbstractFileResolver.java b/src/java/com/google/devtools/mobileharness/shared/file/resolver/AbstractFileResolver.java
index 1f935c494..02d2e15e9 100644
--- a/src/java/com/google/devtools/mobileharness/shared/file/resolver/AbstractFileResolver.java
+++ b/src/java/com/google/devtools/mobileharness/shared/file/resolver/AbstractFileResolver.java
@@ -69,7 +69,7 @@ protected abstract ResolveResult actuallyResolve(ResolveSource resolveSource)
 
   /** Do the real pre process work. */
   protected Set<ResolveResult> actuallyPreBatchProcess(List<ResolveSource> resolveSources)
-      throws MobileHarnessException, InterruptedException {
+      throws MobileHarnessException, InterruptedException, ExecutionException {
     return ImmutableSet.of();
   }
 
@@ -156,7 +156,7 @@ public final ListenableFuture<List<Optional<ResolveResult>>> resolveAsync(
    * @param resolveSources all the files that one mobile test needs
    */
   protected Set<ResolveResult> preBatchProcess(List<ResolveSource> resolveSources)
-      throws MobileHarnessException, InterruptedException {
+      throws MobileHarnessException, InterruptedException, ExecutionException {
     Set<ResolveResult> resolveResults =
         actuallyPreBatchProcess(
             resolveSources.stream().filter(this::shouldActuallyResolve).collect(toImmutableList()));
diff --git a/src/java/com/google/devtools/mobileharness/shared/file/resolver/CacheFileResolver.java b/src/java/com/google/devtools/mobileharness/shared/file/resolver/CacheFileResolver.java
index 611315415..f79792dcc 100644
--- a/src/java/com/google/devtools/mobileharness/shared/file/resolver/CacheFileResolver.java
+++ b/src/java/com/google/devtools/mobileharness/shared/file/resolver/CacheFileResolver.java
@@ -282,7 +282,7 @@ private void removeItemIfValueMatch(CachedResolveSource key, CachedResolveResult
 
   @Override
   protected Set<ResolveResult> preBatchProcess(List<ResolveSource> resolveSources)
-      throws MobileHarnessException, InterruptedException {
+      throws MobileHarnessException, InterruptedException, ExecutionException {
     Set<ResolveResult> resolveResults = super.preBatchProcess(resolveSources);
     for (ResolveResult resolveResult : resolveResults) {
       resolvedResultsCache.putIfAbsent(
diff --git a/src/javatests/com/google/devtools/mobileharness/shared/file/resolver/FileResolverTest.java b/src/javatests/com/google/devtools/mobileharness/shared/file/resolver/FileResolverTest.java
index 97d33c155..677a0d2bd 100644
--- a/src/javatests/com/google/devtools/mobileharness/shared/file/resolver/FileResolverTest.java
+++ b/src/javatests/com/google/devtools/mobileharness/shared/file/resolver/FileResolverTest.java
@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.function.Function;
 import org.junit.Rule;
@@ -133,7 +134,8 @@ public void batchResolve_parallelWithRealThreads()
   }
 
   @Test
-  public void preBatchProcess() throws MobileHarnessException, InterruptedException {
+  public void preBatchProcess()
+      throws MobileHarnessException, InterruptedException, ExecutionException {
     resolver =
         new FileResolverUnderTest(
             MoreExecutors.newDirectExecutorService(), source -> source.path().equals("/a/b"));