| commit | 96384cf7e31bb1c5f32080afeb888107f98eed24 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Feb 12 01:05:55 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 12 01:05:55 2025 -0800 |
| tree | 46620597b8bb0706d2edb225dd557f9b9669c265 | |
| parent | cf5f02f284ff51db20c20b2c6615e027a6d0eca0 [diff] | |
| parent | 3941786c939bb2386b60b7e21dfa4f83df9c437c [diff] |
Merge "Initialize customMemoryBackingFiles with empty array" into main am: d904c323ac am: 3941786c93 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3491350 Change-Id: I430fdd98696abd07d02a8b292dd15e94b9f08692 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java index 83b234d..2668ca2 100644 --- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java +++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -42,6 +42,7 @@ import android.sysprop.HypervisorProperties; import android.system.virtualizationservice.AssignedDevices; import android.system.virtualizationservice.CpuOptions; +import android.system.virtualizationservice.CustomMemoryBackingFile; import android.system.virtualizationservice.DiskImage; import android.system.virtualizationservice.Partition; import android.system.virtualizationservice.SharedPath; @@ -835,6 +836,7 @@ }) .orElse(null); config.teeServices = EMPTY_STRING_ARRAY; + config.customMemoryBackingFiles = new CustomMemoryBackingFile[0]; return config; }