commit 78f66e0b66732695896777df0822c363d5597c1c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 20 11:20:45 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 20 11:20:45 2025 -0700
tree dfc720607cf81c1480988fabcf533e3eb515c274
parent 2a017416ddfb8082f8fcecd773a55cd6c2ef021e
parent 632357fe728ef019b57c5fd40bf8f0bb1c9d0f18

Merge "VirtualMachine: Remove duplicated executor clean up" into main am: 632357fe72

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3554603

Change-Id: I829d4d8fd8de033a007e62c2b0340dbc49c01be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java

diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
index 9df05a1..9641882 100644
--- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
+++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
@@ -1829,9 +1829,6 @@
             try {
                 mVirtualMachine.stop();
                 dropVm();
-                if (mInputEventExecutor != null) {
-                    mInputEventExecutor.shutdownNow();
-                }
             } catch (RemoteException e) {
                 throw e.rethrowAsRuntimeException();
             } catch (ServiceSpecificException e) {