Fix adbConnectToMicrodroid failure handling

Remove potential infinite loop waiting for connect to succeed - apply
the timeout we have.

Also, don't pass a non-positive timeout to `runTimedCmd()`, since it
interprets it as "no timeout".

Bug: 329424318
Test: atest MicrodroidHostTests
Change-Id: I70aced76bba6da62373e415f7f7a434fe7cc4d63

1 files changed, 10 insertions, 9 deletions

diff --git a/src/com/android/tradefed/device/TestDevice.java b/src/com/android/tradefed/device/TestDevice.java
index 40a26d10f..959d65643 100644
--- a/src/com/android/tradefed/device/TestDevice.java
+++ b/src/com/android/tradefed/device/TestDevice.java
@@ -3099,7 +3099,7 @@ public class TestDevice extends NativeDevice {
                 .runTimedCmd(10000, deviceManager.getAdbPath(), "-s", serial, "forward", from, to);
 
         boolean disconnected = true;
-        while (disconnected) {
+        while (disconnected && timeoutMillis >= 0) {
             elapsed = System.currentTimeMillis() - start;
             timeoutMillis -= elapsed;
             start = System.currentTimeMillis();
@@ -3132,14 +3132,15 @@ public class TestDevice extends NativeDevice {
 
         elapsed = System.currentTimeMillis() - start;
         timeoutMillis -= elapsed;
-        getRunUtil()
-                .runTimedCmd(
-                        timeoutMillis,
-                        deviceManager.getAdbPath(),
-                        "-s",
-                        microdroidSerial,
-                        "wait-for-device");
-
+        if (timeoutMillis > 0) {
+            getRunUtil()
+                    .runTimedCmd(
+                            timeoutMillis,
+                            deviceManager.getAdbPath(),
+                            "-s",
+                            microdroidSerial,
+                            "wait-for-device");
+        }
         boolean dataAvailable = false;
         while (!dataAvailable && timeoutMillis >= 0) {
             elapsed = System.currentTimeMillis() - start;