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

Commit 58de99a2 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Move connectSocket into IBluetoothSocketManager (3/3)" am: 8d742759 

am: 9c26701b

Change-Id: I8d0d486b73f8b8130db216a42f1ff045875e3849
parents 8fd59b38 9c26701b

core/java/android/bluetooth/BluetoothSocket.java

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public final class BluetoothSocket implements Closeable { 
            IBluetooth bluetoothProxy =

                    BluetoothAdapter.getDefaultAdapter().getBluetoothService(null);

            if (bluetoothProxy == null) throw new IOException("Bluetooth is off");

            mPfd = bluetoothProxy.connectSocket(mDevice, mType,

            mPfd = bluetoothProxy.getSocketManager().connectSocket(mDevice, mType,

                    mUuid, mPort, getSecurityFlags());

            synchronized (this) {

                if (DBG) Log.d(TAG, "connect(), SocketState: " + mSocketState + ", mPfd: " + mPfd);