commit 8a97b530d1c2fd8d2b3eb42dd318211c53b3bcf0
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 21 16:54:24 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 21 16:54:24 2022 +0000
tree 51f9cab00c6434aacca9ab525941fb6308591a86
parent a43c5816f587872f99495a5608b0256f9376d707
parent 94ad4c8731541d12d84189b1db589700c3fcc0b6

Merge "Don't call onDied() explicitly in MicrodroidTests"

tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java

diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index c7bb011..14ea402 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -142,7 +142,12 @@
         }
 
         void forceStop(VirtualMachine vm) {
-            this.onDied(vm, VirtualMachineCallback.DEATH_REASON_KILLED);
+            try {
+                vm.stop();
+                mExecutorService.shutdown();
+            } catch (VirtualMachineException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override
@@ -160,12 +165,7 @@
         @Override
         @CallSuper
         public void onDied(VirtualMachine vm, @DeathReason int reason) {
-            try {
-                vm.stop();
-                mExecutorService.shutdown();
-            } catch (VirtualMachineException e) {
-                throw new RuntimeException(e);
-            }
+            mExecutorService.shutdown();
         }
     }