diff options
| author | 2025-01-23 14:51:09 -0800 | |
|---|---|---|
| committer | 2025-01-23 14:51:09 -0800 | |
| commit | e383c0f0fda0ba15ff4ffc2132fb2623ce2967d3 (patch) | |
| tree | caf1d245ea49997bbbba8edf2b81713fc63940d9 /framework/java | |
| parent | 721ce9249a0478fc6ee8cf0d7a303b733cf95784 (diff) | |
| parent | 994ffca801543f6447616b1244dfef3a2dcedba0 (diff) | |
Merge "Set socket state to CLOSED on EOF" into main am: a984669344 am: 994ffca801
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3443999
Change-Id: Id94f40f1ea22349d2565655e77cc4a7becc706fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothSocket.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java index 97bdf595a0..cde23baf4d 100644 --- a/framework/java/android/bluetooth/BluetoothSocket.java +++ b/framework/java/android/bluetooth/BluetoothSocket.java @@ -978,6 +978,8 @@ public final class BluetoothSocket implements Closeable { if (mL2capBuffer.remaining() == 0) { if (VDBG) Log.v(TAG, "l2cap buffer empty, refilling..."); if (fillL2capRxBuffer() == -1) { + Log.d(TAG, "socket EOF, returning -1"); + mSocketState = SocketState.CLOSED; return -1; } } @@ -994,6 +996,7 @@ public final class BluetoothSocket implements Closeable { ret = mSocketIS.read(b, offset, length); } if (ret < 0) { + mSocketState = SocketState.CLOSED; throw new IOException("bt socket closed, read return: " + ret); } if (VDBG) Log.d(TAG, "read out: " + mSocketIS + " ret: " + ret); |