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

Commit 9177af37 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4447680 from e33bc3b967aef6f10df82e5b374e4b701ce6ca69 to pi-release 

Change-Id: I01a65cfddf0f5d774ae55f359b88845ce8518ff2
parents 1fe350d5 eb4cb5c5

framework/java/android/bluetooth/BluetoothSocket.java

+2 −2
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);
@@ -417,7 +417,7 @@ public final class BluetoothSocket implements Closeable { 
            return -1;

        }

        try {

            mPfd = bluetoothProxy.createSocketChannel(mType, mServiceName,

            mPfd = bluetoothProxy.getSocketManager().createSocketChannel(mType, mServiceName,

                    mUuid, mPort, getSecurityFlags());

        } catch (RemoteException e) {

            Log.e(TAG, Log.getStackTraceString(new Throwable()));