commit ff0005fe67498b79a0f284b5b4f8abb477aef40f
author Alan Stokes <alanstokes@google.com> Mon Jan 30 09:53:00 2023 +0000
committer Alan Stokes <alanstokes@google.com> Mon Jan 30 15:36:58 2023 +0000
tree 975c790fd341445cbc57de41221108ff1507cf71
parent 8ce72beb2fede707a8c79c279426a678b4618311

Set encrypted storage size in bytes

Change the API to deal in bytes not KiB. Internally, round up to a
size that the crosvm will accept.

Modify callers appropriately. (Deliberately using round numbers in
base 10 not base 2.)

In passing, totally gratuitously switch from sleep to pause; it's
cleaner.

Bug: 262449687
Test: atest MicrodroidTests
Change-Id: I539ceb7845e7345e7e4f5b5b849afaba21497087

javalib/api/system-current.txt

diff --git a/javalib/api/system-current.txt b/javalib/api/system-current.txt
index fe9943d..3482fb5 100644
--- a/javalib/api/system-current.txt
+++ b/javalib/api/system-current.txt
@@ -58,7 +58,7 @@
   public final class VirtualMachineConfig {
     method @Nullable public String getApkPath();
     method @NonNull public int getDebugLevel();
-    method @IntRange(from=0) public long getEncryptedStorageKib();
+    method @IntRange(from=0) public long getEncryptedStorageBytes();
     method @IntRange(from=0) public int getMemoryMib();
     method @IntRange(from=1) public int getNumCpus();
     method @Nullable public String getPayloadBinaryName();
@@ -75,7 +75,7 @@
     method @NonNull public android.system.virtualmachine.VirtualMachineConfig build();
     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 setEncryptedStorageKib(@IntRange(from=1) long);
+    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 setNumCpus(@IntRange(from=1) int);
     method @NonNull public android.system.virtualmachine.VirtualMachineConfig.Builder setPayloadBinaryName(@NonNull String);