Snap for 13184698 from 3ba63e1435230fd37f1546c3cd1cd893717099b0 to 25Q2-release
Change-Id: I58823c71f66fe2323e1012e87ea0f2170c0c59bd
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
index a9b4abe..eee0ada 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
@@ -188,7 +188,10 @@
val displaySize = intent.getParcelableExtra(EXTRA_DISPLAY_INFO, DisplayInfo::class.java)
customImageConfigBuilder.setAudioConfig(
- AudioConfig.Builder().setUseSpeaker(true).setUseMicrophone(true).build()
+ AudioConfig.Builder()
+ .setUseSpeaker(true)
+ .setUseMicrophone(true)
+ .build()
)
if (overrideConfigIfNecessary(customImageConfigBuilder, displaySize)) {
configBuilder.setCustomImageConfig(customImageConfigBuilder.build())
diff --git a/tests/backcompat_test/src/main.rs b/tests/backcompat_test/src/main.rs
index eaf3365..9518c38 100644
--- a/tests/backcompat_test/src/main.rs
+++ b/tests/backcompat_test/src/main.rs
@@ -111,6 +111,7 @@
.truncate(true)
.open("dump_dt.dtb")
.with_context(|| "Failed to open device tree dump file dump_dt.dtb")?;
+ let is_updatable = service.isUpdatableVmSupported()?;
let vm = VmInstance::create(
service.as_ref(),
&config,
@@ -169,7 +170,7 @@
// Check if Secretkeeper is advertised. If not, check the vendor API level. Secretkeeper is
// required as of 202504, and if missing, the test should fail.
// Otherwise, ignore the fields, as they are not required.
- if service.isUpdatableVmSupported()? {
+ if is_updatable {
dtcompare_cmd.arg("--ignore-path-value").arg("/avf/secretkeeper_public_key");
} else if vsr_api_level()? >= 202504 {
return Err(anyhow!("Secretkeeper support missing on vendor API >= 202504. Secretkeeper needs to be implemented."));
@@ -225,7 +226,8 @@
}
fn get_sysprop_i32(prop: &str) -> Result<i32> {
- let res = rustutils::system_properties::read(prop)?;
- res.map(|val| val.parse::<i32>().with_context(|| format!("Failed to read {prop}")))
- .unwrap_or(Ok(-1))
+ let Some(val) = rustutils::system_properties::read(prop)? else {
+ return Ok(-1);
+ };
+ val.parse::<i32>().with_context(|| format!("Failed to read {prop}"))
}