From ad2bb8548ad483fcb03febe0368e68d28ae0eeb5 Mon Sep 17 00:00:00 2001 From: Bhakthavatsala Raghavendra Date: Thu, 9 Jan 2025 00:36:54 +0000 Subject: Set socket state to CLOSED on EOF Bug: 386834325 Test: mmm packages/modules/Bluetooth Flag: Exempt, minor change Change-Id: I46bfd36a672dd7a39e59136c600a2aecb34d3a52 --- framework/java/android/bluetooth/BluetoothSocket.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'framework/java') 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); -- cgit v1.2.3-59-g8ed1b