commit 72061583eae185238e887dea7766548f99715d34
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 20 02:50:51 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 20 02:50:51 2025 -0700
tree 24b77cdc610d2f1ac81b8a98d916adddae73f03f
parent 94deaa8f78046720cb621f097b30c397104cf7c4
parent 87956a95872201656362de1cadfea18c20aa9424

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

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 ad63206..f6cd1cf 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);
         }