| commit | 367566214f766efe61918be1acc05e51c01b11d7 | [log] [tgz] |
|---|---|---|
| author | Shikha Panwar <shikhapanwar@google.com> | Tue Jan 21 07:40:45 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 21 07:40:45 2025 -0800 |
| tree | 336bc5601c3ebd57909c83b0e37741b2ab1a9138 | |
| parent | 9b426f6ead986fa2eab0585b4920474cd9ed1738 [diff] | |
| parent | d9c9f5afbef97583fc34b7168aa1543ba6bba0b5 [diff] |
VM maybe be in stop state when payload finishes am: b484e7b4e4 am: d9c9f5afbe Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3447229 Change-Id: I17d3c4b97be13559c44890f43b9ff4083d32d2cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java index c05fb0b..c4142f0 100644 --- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java +++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -393,6 +393,10 @@ return mProcessedBootTimeMetrics; } + // Stopping a virtual machine is like pulling the plug on a real computer. VM may be left in + // an inconsistent state. + // For a graceful shutdown, request the payload to call {@code exit()} and wait for + // VirtualMachineCallback#onPayloadFinished} to be called. protected void forceStop(VirtualMachine vm) { try { vm.stop(); @@ -722,7 +726,6 @@ public void onPayloadFinished(VirtualMachine vm, int exitCode) { Log.i(logTag, "onPayloadFinished: " + exitCode); payloadFinished.complete(true); - forceStop(vm); } };