commit 87956a95872201656362de1cadfea18c20aa9424
author Jaewan Kim <jaewan@google.com> Thu Mar 20 01:12:05 2025 -0700
committer Jaewan Kim <jaewan@google.com> Thu Mar 20 01:12:05 2025 -0700
tree 8a1028b2084d50ff42c234bead6931d78843b388
parent 0b2c738b814f74dffba422e2d6fb33398af5427f

VirtualMachine: Clean up input event executor when disconnected

Test: T/H
Change-Id: I9534584ad0f42f1ad1a349731fd1584558bba6f2

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);
         }