From 70e58662f0e486eb978618500416879a364c6514 Mon Sep 17 00:00:00 2001
From: Dmitry Kaukov <dkaukov@opentable.com>
Date: Thu, 20 Feb 2025 19:27:06 +1100
Subject: [PATCH] Better cleanup.

---
 .../hoho/android/usbserial/driver/CommonUsbSerialPort.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/CommonUsbSerialPort.java b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/CommonUsbSerialPort.java
index b35624fc..ad7ba7f7 100644
--- a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/CommonUsbSerialPort.java
+++ b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/CommonUsbSerialPort.java
@@ -12,6 +12,7 @@
 import android.hardware.usb.UsbRequest;
 import android.os.Build;
 import android.util.Log;
+import androidx.annotation.NonNull;
 
 import com.hoho.android.usbserial.util.MonotonicClock;
 import com.hoho.android.usbserial.util.UsbUtils;
@@ -62,6 +63,7 @@ public CommonUsbSerialPort(UsbDevice device, int portNumber) {
         mPortNumber = portNumber;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return String.format("<%s device_name=%s device_id=%s port_number=%s>",
@@ -205,8 +207,10 @@ public void close() throws IOException {
             for(UsbRequest readQueueRequest : mReadQueueRequests) {
                 try {
                     readQueueRequest.cancel();
+                    readQueueRequest.close();
                 } catch(Exception ignored) {}
             }
+            mReadQueueRequests.clear();
             mReadQueueRequests = null;
         }
         try {