commit 8cb6bc440a7464e631daad6f63194e017943a23c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 20 03:19:17 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 20 03:19:17 2025 -0700
tree 3a802433f6a4665617a1674fe7bd374fe78a1f4c
parent 830666b7853f2a2df8d962fdeff717b8664d7672
parent 72061583eae185238e887dea7766548f99715d34

Merge "VirtualMachine: Clean up input event executor when disconnected" into main am: 72061583ea

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

Change-Id: Iebdb4d895897425d6b29e2e067cac002707fd473
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 eba6fcc..9df05a1 100644
--- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
+++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
@@ -813,6 +813,10 @@
      */
     @GuardedBy("mLock")
     private void dropVm() {
+        if (mInputEventExecutor != null) {
+            mInputEventExecutor.shutdownNow();
+            mInputEventExecutor = null;
+        }
         if (mMemoryManagementCallbacks != null) {
             mContext.unregisterComponentCallbacks(mMemoryManagementCallbacks);
         }