| commit | d9c9f5afbef97583fc34b7168aa1543ba6bba0b5 | [log] [tgz] |
|---|---|---|
| author | Shikha Panwar <shikhapanwar@google.com> | Tue Jan 21 07:16:04 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 21 07:16:04 2025 -0800 |
| tree | 07d9b188707af4ac32de8ad533bffa7c0ac0b4f0 | |
| parent | 68bbbb45c7b37589d8a2021563ef9eb00ce6c1e2 [diff] | |
| parent | b484e7b4e4a0a984a4772501b37663adbb9aa926 [diff] |
VM maybe be in stop state when payload finishes am: b484e7b4e4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3447229 Change-Id: I8b143d045a645b6e51108784df07c49b6c7023a3 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); } };