Internal change

PiperOrigin-RevId: 757805978

Author: isarkis

src/java/com/google/devtools/mobileharness/platform/android/instrumentation/AndroidInstrumentationUtil.java

@@ -46,6 +46,9 @@
 import com.google.devtools.mobileharness.shared.util.command.Command;
 import com.google.devtools.mobileharness.shared.util.command.CommandException;
 import com.google.devtools.mobileharness.shared.util.command.CommandExecutor;
+import com.google.devtools.mobileharness.shared.util.concurrent.retry.RetryException;
+import com.google.devtools.mobileharness.shared.util.concurrent.retry.RetryStrategy;
+import com.google.devtools.mobileharness.shared.util.concurrent.retry.RetryingCallable;
 import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
 import com.google.devtools.mobileharness.shared.util.file.local.ResUtil;
 import com.google.devtools.mobileharness.shared.util.path.PathUtil;
@@ -177,6 +180,11 @@ public interface AppInstallFinishHandler {
   private static final String TEST_ARG_GEN_FILE_DIR_RELATIVE_PATH =
       DirCommon.KEY_NAME_OF_TEST_GEN_FILE_DIR_RELATIVE_PATH;
 
+  /* Device reconnect configuration parameters. */
+  private static final int DEVICE_RECONNECT_MAX_RETRIES = 3;
+  private static final Duration DEVICE_RECONNECT_INITIAL_DELAY = Duration.ofSeconds(5);
+  private static final int DEVICE_RECONNECT_DELAY_MULTIPLIER = 3;
+
   /** Android SDK ADB command line tools executor. */
   private final Adb adb;
 
@@ -1029,14 +1037,34 @@ public void pullInstrumentationFilesFromDevice(
       throws InterruptedException {
     // b/132998532. Device may be disconnected within instrumentation test, so ensure device is
     // online before pulling files from it.
+    boolean isDeviceOnline = false;
     try {
-      boolean isDeviceOnline;
-      try {
-        isDeviceOnline = systemStateManager.isOnline(deviceId);
-      } catch (MobileHarnessException e) {
-        throw new MobileHarnessException(
-            AndroidErrorId.ANDROID_INSTRUMENTATION_GET_ONLINE_DEVICES_ERROR, e.getMessage(), e);
-      }
+      isDeviceOnline =
+          RetryingCallable.newBuilder(
+                  () -> {
+                    boolean isOnline = false;
+                    try {
+                      isOnline = systemStateManager.isOnline(deviceId);
+                    } catch (MobileHarnessException e) {
+                      throw new MobileHarnessException(
+                          AndroidErrorId.ANDROID_INSTRUMENTATION_GET_ONLINE_DEVICES_ERROR,
+                          e.getMessage(),
+                          e);
+                    }
+                    if (!isOnline) {
+                      throw new MobileHarnessException(
+                          AndroidErrorId.ANDROID_INSTRUMENTATION_GET_ONLINE_DEVICES_ERROR,
+                          String.format("Device %s is not online", deviceId));
+                    }
+                    return true;
+                  },
+                  RetryStrategy.exponentialBackoff(
+                      DEVICE_RECONNECT_INITIAL_DELAY,
+                      DEVICE_RECONNECT_DELAY_MULTIPLIER,
+                      DEVICE_RECONNECT_MAX_RETRIES))
+              .setPredicate(e -> e instanceof MobileHarnessException)
+              .build()
+              .call();
       if (isDeviceOnline) {
         processInstrumentOutputFiles(testInfo, deviceId, externalStoragePath);
         processInstrumentPropertyFiles(testInfo, deviceId, externalStoragePath);
@@ -1053,14 +1081,21 @@ public void pullInstrumentationFilesFromDevice(
             .log()
             .atInfo()
             .alsoTo(logger)
-            .log("Device %s is not online, skip pulling instrumentation files from it", deviceId);
+            .log(
+                "Device %s is not online after %d retries, skip pulling instrumentation files from"
+                    + " it",
+                deviceId, DEVICE_RECONNECT_MAX_RETRIES);
       }
-    } catch (MobileHarnessException e) {
+    } catch (RetryException | MobileHarnessException e) {
       testInfo
           .warnings()
           .addAndLog(
               new MobileHarnessException(
-                  AndroidErrorId.ANDROID_INSTRUMENTATION_PULL_FILE_ERROR, e.getMessage(), e),
+                  AndroidErrorId.ANDROID_INSTRUMENTATION_PULL_FILE_ERROR,
+                  String.format(
+                      "Failed to check if device %s is online after %d retries",
+                      deviceId, DEVICE_RECONNECT_MAX_RETRIES),
+                  e),
               logger);
     }
   }

src/java/com/google/devtools/mobileharness/platform/android/instrumentation/BUILD

@@ -47,6 +47,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/shared/util/auto:auto_value",
         "//src/java/com/google/devtools/mobileharness/shared/util/base",
         "//src/java/com/google/devtools/mobileharness/shared/util/command",
+        "//src/java/com/google/devtools/mobileharness/shared/util/concurrent/retry",
         "//src/java/com/google/devtools/mobileharness/shared/util/file/local",
         "//src/java/com/google/devtools/mobileharness/shared/util/file/local:res_util",
         "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
@@ -60,8 +61,6 @@ java_library(
         "//src/java/com/google/wireless/qa/mobileharness/shared/constant:property",
         "//src/java/com/google/wireless/qa/mobileharness/shared/model/job",
         "//src/java/com/google/wireless/qa/mobileharness/shared/model/job/out",
-        "//src/java/com/google/wireless/qa/mobileharness/shared/model/job/util:result_util",
-        "//src/java/com/google/wireless/qa/mobileharness/shared/proto:job_java_proto",
         "//src/java/com/google/wireless/qa/mobileharness/shared/proto/spec:android_instrumentation_spec_java_proto",
         "@maven//:androidx_test_services_storage",
         "@maven//:com_google_code_findbugs_jsr305",