commit 5b7cb1a60613fb4e9304f92276ecff9657feab88
author Jiyong Park <jiyong@google.com> Mon Mar 24 17:42:38 2025 +0900
committer Jiyong Park <jiyong@google.com> Mon Mar 24 18:00:13 2025 +0900
tree 0b2a5f30162c8e029986fc4ff2355896577ba715
parent 47193d2974e98787708cab692a7d2b51984f32b6

Ignore debug policy for custom VMs

Custom VMs don't understand the semantics of debug policy like crash
kernel, adb, etc. In the worst case, debug policy may kill the custom VM
because the VM doesn't understand the params added due to the debug
policy.

Bug: 394995493
Test: run ferrochrome on devices with a DPM where debug_policy.ramdump
is on.

Change-Id: I1dd387843e2106415a6087158e7829ebe7a48ae2

android/virtmgr/src/debug_config.rs

diff --git a/android/virtmgr/src/debug_config.rs b/android/virtmgr/src/debug_config.rs
index 6e2bfef..e552cf4 100644
--- a/android/virtmgr/src/debug_config.rs
+++ b/android/virtmgr/src/debug_config.rs
@@ -191,7 +191,7 @@
 impl DebugConfig {
     pub fn new(config: &VirtualMachineConfig) -> Self {
         let debug_level = get_debug_level(config).unwrap_or(DebugLevel::NONE);
-        let debug_policy = Self::get_debug_policy().unwrap_or_else(|| {
+        let debug_policy = Self::get_debug_policy(config).unwrap_or_else(|| {
             info!("Debug policy is disabled");
             Default::default()
         });
@@ -204,7 +204,11 @@
         Self { debug_level, debug_policy, dump_device_tree }
     }
 
-    fn get_debug_policy() -> Option<DebugPolicy> {
+    fn get_debug_policy(config: &VirtualMachineConfig) -> Option<DebugPolicy> {
+        if matches!(config, VirtualMachineConfig::RawConfig(_)) {
+            info!("Debug policy ignored for non-Microdroid VM");
+            return None;
+        }
         let dp_sysprop = system_properties::read(CUSTOM_DEBUG_POLICY_OVERLAY_SYSPROP);
         let custom_dp = dp_sysprop.unwrap_or_else(|e| {
             warn!("Failed to read sysprop {CUSTOM_DEBUG_POLICY_OVERLAY_SYSPROP}: {e}");