| commit | 3941786c939bb2386b60b7e21dfa4f83df9c437c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Feb 12 00:29:33 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 12 00:29:33 2025 -0800 |
| tree | f5944eccffda4b407cd287c80abbeb62516a1ae4 | |
| parent | 6ad2f97f8a8551dac92aaf1a466cd375d48d4c06 [diff] | |
| parent | d904c323ac07e60729b3b86a44f76de27c2aff9f [diff] |
Merge "Initialize customMemoryBackingFiles with empty array" into main am: d904c323ac Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3491350 Change-Id: Id6886774e6f86639202c2017896a013738eeca50 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; }