commit 3be2b3bac5b1c31e1bf4e4ccc6811506d12dcd84
author Jiyong Park <jiyong@google.com> Wed Mar 12 23:59:12 2025 +0900
committer Jiyong Park <jiyong@google.com> Thu Mar 13 01:51:36 2025 +0900
tree 680cb0a82829622f397097344f793c5116141f69
parent 8c3e8e620bc754b321864c01aaac6c2ed48276d6

Give longer boot timeout when running in CF or goldfish

Also, increase the normal boot timeout from 20s to 30s to match with the
test.

Bug: 402727622
Test: run TerminalAppTests on CF
Change-Id: I6c89b9bd1fb0d2e2c269ff4239e8aeff77e51d44

android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
index 94b7011..05b387f 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
@@ -31,6 +31,7 @@
 import android.os.Parcel
 import android.os.Parcelable
 import android.os.ResultReceiver
+import android.os.SystemProperties
 import android.os.Trace
 import android.system.virtualmachine.VirtualMachine
 import android.system.virtualmachine.VirtualMachineCustomImageConfig
@@ -479,7 +480,18 @@
         private const val KEY_TERMINAL_IPADDRESS = "address"
         private const val KEY_TERMINAL_PORT = "port"
 
-        private const val VM_BOOT_TIMEOUT_SECONDS = 20
+        private val VM_BOOT_TIMEOUT_SECONDS: Int =
+            {
+                val deviceName = SystemProperties.get("ro.product.vendor.device", "")
+                val cuttlefish = deviceName.startsWith("vsoc_")
+                val goldfish = deviceName.startsWith("emu64")
+
+                if (cuttlefish || goldfish) {
+                    3 * 60
+                } else {
+                    30
+                }
+            }()
 
         private const val INITIAL_MEM_BALLOON_PERCENT = 10
         private const val MAX_MEM_BALLOON_PERCENT = 50