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

Commit 65757cf0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Throw an IOException on EOF instead of returning error"" into... 

Merge "Revert "Throw an IOException on EOF instead of returning error"" into main am: b4bfdb23 am: 10ef2873

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



Change-Id: Ib435f49f3e06d1bb9867ee2916ef896d6359252f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a93c7a18 10ef2873

framework/java/android/bluetooth/BluetoothSocket.java

+1 −1
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) {

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

                    return -1;

                }

            }

            if (bytesToRead > mL2capBuffer.remaining()) {