commit bdd14eb4b6ef2b8a24d973f7dbc820ff091344fd
author Julien Desprez <jdesprez@google.com> Wed Mar 22 15:58:13 2023 -0700
committer Julien Desprez <jdesprez@google.com> Wed Mar 22 15:58:47 2023 -0700
tree 9b69940a413ed30ccc2187616a8d04cc0e616e95
parent cd0dfd7f3995aa05ea7d796dd9102cc3367503cf

Fix instance type, confused them

need the recent stuff that represent CF

Test: presubmit
Bug: 230898418
Change-Id: Ic9815ee9ff6eb1b0fc72ebde2a4047df8a89ecb4

src/com/android/tradefed/device/connection/DefaultConnection.java

diff --git a/src/com/android/tradefed/device/connection/DefaultConnection.java b/src/com/android/tradefed/device/connection/DefaultConnection.java
index de49a02..e72292f 100644
--- a/src/com/android/tradefed/device/connection/DefaultConnection.java
+++ b/src/com/android/tradefed/device/connection/DefaultConnection.java
@@ -59,7 +59,8 @@
         }
         if (builder.device != null) {
             InstanceType type = builder.device.getOptions().getInstanceType();
-            if (InstanceType.REMOTE_AVD.equals(type) || InstanceType.GCE.equals(type)) {
+            if (InstanceType.CUTTLEFISH.equals(type)
+                    || InstanceType.REMOTE_NESTED_AVD.equals(type)) {
                 ((NativeDevice) builder.device).setLogStartDelay(0);
                 ((NativeDevice) builder.device).setFastbootEnabled(false);
                 return new AdbSshConnection(builder);