commit bfd59c942fa749503cea8b3cded22d32f1ca6d34
author Pierre-Clément Tosi <ptosi@google.com> Wed Jan 08 03:45:12 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 03:45:12 2025 -0800
tree baf653eba70dc8b47c0356644008f6674875ced3
parent c105b4d01f44e1ffc54a24ee74c0ddd6ddd488e7
parent 6ad389e72a782d72e3b09e80fde96e07d98cdfb8

Merge "virtmgr: Don't detect hangup when using GDB" into main am: 177a211278 am: 6ad389e72a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3439044

Change-Id: I8a58fcff5a12e57f084ae98b98c0e478da4e83c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 5ad7ee1..57779bf 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -819,6 +819,8 @@
             .unwrap_or(Ok(UsbConfig { controller: false }))
             .or_binder_exception(ExceptionCode::BAD_PARCELABLE)?;
 
+        let detect_hangup = is_app_config && gdb_port.is_none();
+
         // Actually start the VM.
         let crosvm_config = CrosvmConfig {
             cid,
@@ -846,7 +848,7 @@
             ramdump,
             indirect_files,
             platform_version: parse_platform_version_req(&config.platformVersion)?,
-            detect_hangup: is_app_config,
+            detect_hangup,
             gdb_port,
             vfio_devices,
             dtbo,