commit 57fd7c9573f2870e365296056c00c0ee60954036
author Jiyong Park <jiyong@google.com> Mon Jul 12 21:37:13 2021 +0900
committer Jiyong Park <jiyong@google.com> Tue Jul 13 10:58:45 2021 +0900
tree af3b911dcb9aab2d678cb5d0dbdc249c7f7c5042
parent 8611a6c9f633a680dec9e089fd9a57929eb003fb

Follow-up for aosp/1760496

Bug: 183496040
Test: atest MicrodroidHostTestCases
Change-Id: I0db1e97e3fa78885642fa71c290b259e1d3feb0f

javalib/src/android/system/virtualmachine/VirtualMachine.java

diff --git a/javalib/src/android/system/virtualmachine/VirtualMachine.java b/javalib/src/android/system/virtualmachine/VirtualMachine.java
index 0e549ae..7176486 100644
--- a/javalib/src/android/system/virtualmachine/VirtualMachine.java
+++ b/javalib/src/android/system/virtualmachine/VirtualMachine.java
@@ -112,6 +112,9 @@
     /* package */ static VirtualMachine create(
             Context context, String name, VirtualMachineConfig config)
             throws VirtualMachineException {
+        if (config == null) {
+            throw new VirtualMachineException("null config");
+        }
         VirtualMachine vm = new VirtualMachine(context, name, config);
 
         try {
@@ -331,6 +334,10 @@
         if (!oldConfig.isCompatibleWith(newConfig)) {
             throw new VirtualMachineException("incompatible config");
         }
+        if (getStatus() != Status.STOPPED) {
+            throw new VirtualMachineException(
+                    "can't change config while virtual machine is not stopped");
+        }
 
         try {
             FileOutputStream output = new FileOutputStream(mConfigFilePath);