| commit | cd08d5eb92f90fe4bb15ba288e638ede2154d498 | [log] [tgz] |
|---|---|---|
| author | Sebastian Ene <sebastianene@google.com> | Thu Oct 13 15:27:24 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 13 15:27:24 2022 +0000 |
| tree | 01fa507bee408e184e2440b5533c092618d483de | |
| parent | 7b0255e57ae3abd3ffb128633b9f2788bc6bc986 [diff] | |
| parent | 4a9f2feeeaaa714f7ab61e8eb26f03db9d8d7b15 [diff] |
Merge "Prevent stalled adb connections to Micrdroid"
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java index 0b67719..2df829c 100644 --- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java +++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -387,6 +387,9 @@ long timeoutMillis = MICRODROID_ADB_CONNECT_TIMEOUT_MINUTES * 60 * 1000; long elapsed = 0; + // In case there is a stale connection... + tryRunOnHost("adb", "disconnect", MICRODROID_SERIAL); + final String serial = androidDevice.getSerialNumber(); final String from = "tcp:" + TEST_VM_ADB_PORT; final String to = "vsock:" + cid + ":5555";