Fix failure in outputIsNotRedirectedToLogcatIfNotDebuggable
This issue is mix of both test side issue and code.
In test, tests expects no console output for non-debuggable VM
but DP may enables console output. Currently userdebug build does so.
Stops runnning the test if DP would turn on console output.
In code, console output hasn't been properly printed even when DP enables
console output for unprotected + non-debuggable.
Fixes the issue by adding necessary bootargs for unprotected +
non-debuggable VM.
Bug: 270652149
Test: atest and run unprotected + non-debuggable VM when DP enables log
Change-Id: I79bf4f74d4cc4acc3e6ddcbe9452ec1560158fa4
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index 5cd523d..48e2431 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -325,6 +325,11 @@
None
};
+ let debug_level = match config {
+ VirtualMachineConfig::AppConfig(app_config) => app_config.debugLevel,
+ _ => DebugLevel::NONE,
+ };
+
let state = &mut *self.state.lock().unwrap();
let console_fd =
clone_or_prepare_logger_fd(config, console_fd, format!("Console({})", cid))?;
@@ -425,6 +430,7 @@
disks,
params: config.params.to_owned(),
protected: *is_protected,
+ debug_level,
memory_mib: config.memoryMib.try_into().ok().and_then(NonZeroU32::new),
cpus,
host_cpu_topology,