Set memory size in bytes
Convert from bytes to MiB (rounding up) before passing to VS.
(We could also modify VS to take bytes, but it's not obvious to me
that that's a win.)
Modify tests & benchmarks to compensate.
Bug: 262449687
Test: atest MicrodroidTests
Change-Id: I7781e750c34d5ffec4ec282d7c28b4a8419ba69b
diff --git a/javalib/api/system-current.txt b/javalib/api/system-current.txt
index 3482fb5..b455c85 100644
--- a/javalib/api/system-current.txt
+++ b/javalib/api/system-current.txt
@@ -59,7 +59,7 @@
method @Nullable public String getApkPath();
method @NonNull public int getDebugLevel();
method @IntRange(from=0) public long getEncryptedStorageBytes();
- method @IntRange(from=0) public int getMemoryMib();
+ method @IntRange(from=0) public long getMemoryBytes();
method @IntRange(from=1) public int getNumCpus();
method @Nullable public String getPayloadBinaryName();
method public boolean isCompatibleWith(@NonNull android.system.virtualmachine.VirtualMachineConfig);
@@ -76,7 +76,7 @@
method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setApkPath(@NonNull String);
method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setDebugLevel(int);
method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setEncryptedStorageBytes(@IntRange(from=1) long);
- method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setMemoryMib(@IntRange(from=1) int);
+ method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setMemoryBytes(@IntRange(from=1) long);
method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setNumCpus(@IntRange(from=1) int);
method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setPayloadBinaryName(@NonNull String);
method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setProtectedVm(boolean);