commit 69ab0132b0aecd2f790dcafb18d90db855782e23
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 15 17:26:06 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 15 17:26:06 2022 +0000
tree cf5d043a995d99bcfdd6554944c16fe3d6a057b3
parent 27b22fc2e9be836ef662e1ac068238606a545a2c
parent 5d0f89ab73374955b7b98548ca15ab90f0f28d0d

Merge "[apkverify] Introduce enums for signature and content digest algorithms"

tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java

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 e5bc45a..a07731e 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
@@ -210,9 +210,7 @@
 
         protected void forceStop(VirtualMachine vm) {
             try {
-                vm.clearCallback();
                 vm.stop();
-                mExecutorService.shutdown();
             } catch (VirtualMachineException e) {
                 throw new RuntimeException(e);
             }
@@ -233,6 +231,7 @@
         @Override
         @CallSuper
         public void onDied(VirtualMachine vm, int reason) {
+            vm.clearCallback();
             mExecutorService.shutdown();
         }