Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30919026 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Revert "Return -1 on socket read EOF" am: f59c8965 am: 7b2c9350 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3446488



Change-Id: I18fbbf7b1824e8042b72bb69437afb6f1b7ab894
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3564f82 7b2c9350

framework/java/android/bluetooth/BluetoothSocket.java

+2 −2
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ public final class BluetoothSocket implements Closeable { 
            if (mL2capBuffer.remaining() == 0) {

                if (VDBG) Log.v(TAG, "l2cap buffer empty, refilling...");

                if (fillL2capRxBuffer() == -1) {

                    return -1;

                    throw new IOException("bt socket closed, read return: " + ret);

                }

            }

            if (bytesToRead > mL2capBuffer.remaining()) {
@@ -994,7 +994,7 @@ public final class BluetoothSocket implements Closeable { 
            ret = mSocketIS.read(b, offset, length);

        }

        if (ret < 0) {

            return -1;

            throw new IOException("bt socket closed, read return: " + ret);

        }

        if (VDBG) Log.d(TAG, "read out:  " + mSocketIS + " ret: " + ret);

        return ret;