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

Commit 9c0f2c1c authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am: 3e9b9b74b4 am: 7b38581ded 

am: cff746a0

Change-Id: I88dd168c05343ed2cd2715a2b6da8eb5bae69600
parents 6735e4e6 cff746a0

framework/java/android/bluetooth/BluetoothSocket.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -417,7 +417,7 @@ public final class BluetoothSocket implements Closeable { 
            return -1;

            return -1;

        }

        }

        try {

        try {

            mPfd = bluetoothProxy.createSocketChannel(mType, mServiceName,

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

                    mUuid, mPort, getSecurityFlags());

                    mUuid, mPort, getSecurityFlags());

        } catch (RemoteException e) {

        } catch (RemoteException e) {

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

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