commit ad66b4521de5a6710bbb34b9dc48e1b4aedec900
author Jeongik Cha <jeongik@google.com> Wed Dec 11 10:16:18 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 10:16:18 2024 +0000
tree d1c642ddd3d5bb731d732b9fb160f124770b4909
parent 053b047b552e2ddc297f9e51e483f1907eabb2a3
parent 12ba16590a184388df7760c0bfb81cb4d3c14edd

Add auto_memory_balloon in vm_config.json am: 12ba16590a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3405219

Change-Id: I218884b9859a8581c8327f05b423624f22eac041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java b/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java
index b79e346..a0fca82 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/ConfigJson.java
@@ -76,6 +76,7 @@
     private SharedPathJson[] sharedPath;
     private DisplayJson display;
     private GpuJson gpu;
+    private boolean auto_memory_balloon;
 
     /** Parses JSON file at jsonPath */
     static ConfigJson from(Context context, Path jsonPath) {
@@ -145,7 +146,8 @@
                 .setBootloaderPath(bootloader)
                 .setKernelPath(kernel)
                 .setInitrdPath(initrd)
-                .useNetwork(network);
+                .useNetwork(network)
+                .useAutoMemoryBalloon(auto_memory_balloon);
 
         if (input != null) {
             builder.useTouch(input.touchscreen)