Merge "guest: trusty: security_vm: vm: Android.bp update" into main
diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index b5cf643..1a263bd 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -707,6 +707,12 @@
config
.disks
.iter()
+ .flat_map(|disk| disk.image.as_ref())
+ .try_for_each(|image| check_label_for_file(image, "disk image", calling_partition))
+ .or_service_specific_exception(-1)?;
+ config
+ .disks
+ .iter()
.flat_map(|disk| disk.partitions.iter())
.filter(|partition| {
if is_app_config {
@@ -1582,7 +1588,7 @@
Ok(())
}
fn check_label_for_file(
- file: &File,
+ file: &impl AsRawFd,
name: &str,
calling_partition: CallingPartition,
) -> Result<()> {
diff --git a/android/virtualizationservice/src/aidl.rs b/android/virtualizationservice/src/aidl.rs
index 0f16291..f4e64e3 100644
--- a/android/virtualizationservice/src/aidl.rs
+++ b/android/virtualizationservice/src/aidl.rs
@@ -412,8 +412,12 @@
}
fn isRemoteAttestationSupported(&self) -> binder::Result<bool> {
- Ok(is_remote_provisioning_hal_declared()?
- && remote_provisioning::is_remote_attestation_supported())
+ if is_remote_provisioning_hal_declared()? {
+ Ok(remote_provisioning::is_remote_attestation_supported())
+ } else {
+ warn!("AVF IRemotelyProvisionedComponent HAL is not declared");
+ Ok(false)
+ }
}
fn getAssignableDevices(&self) -> binder::Result<Vec<AssignableDevice>> {